Advertisement
Not a member of Pastebin yet?
Sign Up,
it unlocks many cool features!
- command 'git commit -m "Changes by web interface(user admin) тест"' returned exit_code 1, stdout: # On branch preproduction-changes # Your branch and 'origin/preproduction-changes' have diverged, # and have 13 and 12 different commits each, respectively. # # Untracked files: # (use "git add ..." to include in what will be committed) # # advert/ # banners/ # brosh_knopka.png # brosh_knopka_fb_thumb.png # broshure_knopka.png # broshure_knopka_fb_thumb.png # buttons/ # cnmcbnm.png # cnmcbnm_fb_thumb.png # coating.png # coating_fb_thumb.png # conf_programme.doc # depo.png # depo_fb_thumb.png # docs/ # emailing/ # emails/ # energoaudit_programme.doc # events/ # expoclean_2013_eng.doc # expoclean_2013_rus.doc # expocoating_siberia_en.doc # expocoating_siberia_rus.doc # favicon.ico # federalnaya.png # federalnaya_fb_thumb.png # flashbuttons_ru.swf # forthcoming_events/ # forumrinka1.doc # hjkfhkj.png # hjkfhkj_fb_thumb.png # images/1-1340073_26312933-001.jpg # images/1-1340073_26312933-001_fb_thumb.jpg # images/1-1340073_26312933.jpg # images/1-1340073_26312933_fb_thumb.jpg # images/1-1402397_17502231-001.jpg # images/1-1402397_17502231-001_fb_thumb.jpg # images/1-1402397_17502231.jpg # images/1-1402397_17502231_fb_thumb.jpg # images/1-shokobox.jpg # images/1-shokobox_fb_thumb.jpg # images/21115510.gif # images/21115510_fb_thumb.gif # images/_menu_button_fill_fb_thumb.png # images/all_news_fb_thumb.gif # images/big_button_fb_thumb.jpg # images/big_refs_marker_fb_thumb.gif # images/big_refs_underline_fb_thumb.gif # images/btn_mashport.png # images/btn_mashport_fb_thumb.png # images/button_fill_fb_thumb.jpg # images/buttons_fb_thumb.jpg # images/buttonsm_fb_thumb.jpg # images/content_triangle_fb_thumb.png # images/dotted_red_fb_thumb.gif # images/energyexpert_ban.gif # images/energyexpert_ban_fb_thumb.gif # images/expo_fb_thumb.jpg # images/flickr_fb_thumb.gif # images/footer_fill_fb_thumb.jpg # images/form_edit_fill_fb_thumb.jpg # images/form_fieldset_fill_fb_thumb.gif # images/header_bottom_fill_fb_thumb.jpg # images/header_fill_fb_thumb.jpg # images/header_panel_close_fb_thumb.png # images/header_panel_en_fb_thumb.gif # images/header_panel_fill_fb_thumb.jpg # images/header_panel_persona_fb_thumb.png # images/header_panel_ru_fb_thumb.gif # images/header_panel_search_fb_thumb.png # images/header_panel_separation_fb_thumb.jpg # images/header_panel_sub_fill_fb_thumb.jpg # images/invite_fill_fb_thumb.png # images/live_internet_fb_thumb.gif # images/logo_fb_thumb.png # images/logo_old.png # images/logo_old_fb_thumb.png # images/marker_blue_fb_thumb.gif # images/marker_fb_thumb.gif # images/marker_red_fb_thumb.gif # images/marketing_week_100.gif # images/marketing_week_100_fb_thumb.gif # images/marketing_week_240.gif # images/marketing_week_240_fb_thumb.gif # images/menu_button_fill_fb_thumb.png # images/menu_fill_fb_thumb.jpg # images/menu_general_fill_fb_thumb.jpg # images/menu_logotype1_fb_thumb.png # images/menu_logotype2_fb_thumb.png # images/menu_marker_fb_thumb.png # images/menu_separation_fb_thumb.png # images/menu_shadow_fb_thumb.png # images/menu_sub_fill_fb_thumb.png # images/menu_wrapper_fill_fb_thumb.jpg # images/middle_fill_fb_thumb.jpg # images/ndt_1.jpg # images/ndt_10.jpg # images/ndt_10_fb_thumb.jpg # images/ndt_11.jpg # images/ndt_11_fb_thumb.jpg # images/ndt_12.jpg # images/ndt_12_fb_thumb.jpg # images/ndt_13.jpg # images/ndt_13_fb_thumb.jpg # images/ndt_14.jpg # images/ndt_14_fb_thumb.jpg # images/ndt_15.jpg # images/ndt_15_fb_thumb.jpg # images/ndt_1_1.jpg # images/ndt_1_1_fb_thumb.jpg # images/ndt_1_2.jpg # images/ndt_1_2_fb_thumb.jpg # images/ndt_1_fb_thumb.jpg # images/ndt_2.jpg # images/ndt_2_fb_thumb.jpg # images/ndt_3.jpg # images/ndt_3_fb_thumb.jpg # images/ndt_4.jpg # images/ndt_4_fb_thumb.jpg # images/ndt_5.jpg # images/ndt_5_fb_thumb.jpg # images/ndt_6.jpg # images/ndt_6_fb_thumb.jpg # images/ndt_7.jpg # images/ndt_7_fb_thumb.jpg # images/ndt_8.jpg # images/ndt_8_fb_thumb.jpg # images/ndt_9.jpg # images/ndt_9_fb_thumb.jpg # images/ndt_fb_thumb.jpg # images/ndt_logos4site-01.jpg # images/ndt_logos4site-01_fb_thumb.jpg # images/ndt_logos4site-02.jpg # images/ndt_logos4site-02_fb_thumb.jpg # images/ndt_logos4site-04.jpg # images/ndt_logos4site-04_fb_thumb.jpg # images/ndt_logos4site-05.jpg # images/ndt_logos4site-05_fb_thumb.jpg # images/ndt_logos4site-06.jpg # images/ndt_logos4site-06_fb_thumb.jpg # images/ndt_logos4site-07.jpg # images/ndt_logos4site-07_fb_thumb.jpg # images/ndt_logos4site-11.jpg # images/ndt_logos4site-11_fb_thumb.jpg # images/ndt_logos4site4-03.jpg # images/ndt_logos4site4-03_fb_thumb.jpg # images/ndt_video_2.jpg # images/ndt_video_2_fb_thumb.jpg # images/panel_caption_fill_fb_thumb.jpg # images/panel_fill_fb_thumb.jpg # images/panels_fill_fb_thumb.jpg # images/partner_ite_fb_thumb.png # images/partner_logotype_fb_thumb.png # images/partner_primexpo_fb_thumb.png # images/partner_rsl_fb_thumb.png # images/partner_ufi_fb_thumb.png # images/partners150x150.jpg # images/partners150x150_fb_thumb.jpg # images/resalts.png # images/resalts_fb_thumb.png # images/shokobox.jpg # images/shokobox_fb_thumb.jpg # images/slider_fill_fb_thumb.jpg # images/slider_list_marker_fb_thumb.gif # images/spectr.gif # images/spectr_1.gif # images/spectr_1_fb_thumb.gif # images/spectr_fb_thumb.gif # images/table_border_fb_thumb.gif # images/technoclean_eng.jpg # images/technoclean_eng_fb_thumb.jpg # images/technoclean_rus.jpg # images/technoclean_rus_fb_thumb.jpg # images/title_fill_fb_thumb.jpg # images/title_fill_fb_thumb.png # images/title_inner_undeline_fb_thumb.jpg # images/title_mini_undeline_fb_thumb.jpg # images/title_mini_undeline_fb_thumb.png # images/title_sidebar_fill_fb_thumb.jpg # images/title_undeline_fb_thumb.jpg # images/youtube_fb_thumb.gif # individ_registr/ # kjgkjh.png # kjgkjh_fb_thumb.png # main1.css # metaprom-logo.png # metaprom-logo_fb_thumb.png # ndt-seminar-13-240x420-01.png # ndt-seminar-13-240x420-01_fb_thumb.png # ndt-seminar-13-420x240-01.png # ndt-seminar-13-420x240-01_fb_thumb.png # ndt-siberia-13-184x40.tif # ndt-siberia-13-184x40_fb_thumb.tif # ndt_2014_eng.doc # ndt_2014_rus.doc # ndt_hotel_2014_rus.doc # ndt_hotel__2014_eng.doc # ndt_journal_1.swf # ndt_siberia_eng.doc # ndt_siberia_rus.doc # otzivi_knopka.png # otzivi_knopka_fb_thumb.png # part1.png # part1_fb_thumb.png # podrobnee.png # podrobnee_fb_thumb.png # pozdre.png # pozdre_fb_thumb.png # runeft.png # runeft_fb_thumb.png # runeft_portal.png # runeft_portal_fb_thumb.png # sec.ru.png # sec.ru_fb_thumb.png # spbtpp.png # spbtpp_fb_thumb.png # sticker.png # sticker_fb_thumb.png # ushast_knopka.png # ushast_knopka_fb_thumb.png # xghnxfgh.png # xghnxfgh_fb_thumb.png # "\320\276\321\202\321\207\320\265\321\202_\320\276\321\202_\320\260\321\200\321\202\320\265\320\274\321\214\320\265\320\262\320\260.doc" # "\320\276\321\202\321\207\320\265\321\202_\320\276\321\202_\320\272\321\203\320\267\320\265\320\273\320\265\320\262\320\260_.doc" nothing added to commit but untracked files present (use "git add" to track) :
- # On branch preproduction-changes
- # Your branch and 'origin/preproduction-changes' have diverged,
- # and have 13 and 12 different commits each, respectively.
- #
- # Untracked files:
- # (use "git add ..." to include in what will be committed)
- #
- # advert/
- # banners/
- # brosh_knopka.png
- # brosh_knopka_fb_thumb.png
- # broshure_knopka.png
- # broshure_knopka_fb_thumb.png
- # buttons/
- # cnmcbnm.png
- # cnmcbnm_fb_thumb.png
- # coating.png
- # coating_fb_thumb.png
- # conf_programme.doc
- # depo.png
- # depo_fb_thumb.png
- # docs/
- # emailing/
- # emails/
- # energoaudit_programme.doc
- # events/
- # expoclean_2013_eng.doc
- # expoclean_2013_rus.doc
- # expocoating_siberia_en.doc
- # expocoating_siberia_rus.doc
- # favicon.ico
- # federalnaya.png
- # federalnaya_fb_thumb.png
- # flashbuttons_ru.swf
- # forthcoming_events/
- # forumrinka1.doc
- # hjkfhkj.png
- # hjkfhkj_fb_thumb.png
- # images/1-1340073_26312933-001.jpg
- # images/1-1340073_26312933-001_fb_thumb.jpg
- # images/1-1340073_26312933.jpg
- # images/1-1340073_26312933_fb_thumb.jpg
- # images/1-1402397_17502231-001.jpg
- # images/1-1402397_17502231-001_fb_thumb.jpg
- # images/1-1402397_17502231.jpg
- # images/1-1402397_17502231_fb_thumb.jpg
- # images/1-shokobox.jpg
- # images/1-shokobox_fb_thumb.jpg
- # images/21115510.gif
- # images/21115510_fb_thumb.gif
- # images/_menu_button_fill_fb_thumb.png
- # images/all_news_fb_thumb.gif
- # images/big_button_fb_thumb.jpg
- # images/big_refs_marker_fb_thumb.gif
- # images/big_refs_underline_fb_thumb.gif
- # images/btn_mashport.png
- # images/btn_mashport_fb_thumb.png
- # images/button_fill_fb_thumb.jpg
- # images/buttons_fb_thumb.jpg
- # images/buttonsm_fb_thumb.jpg
- # images/content_triangle_fb_thumb.png
- # images/dotted_red_fb_thumb.gif
- # images/energyexpert_ban.gif
- # images/energyexpert_ban_fb_thumb.gif
- # images/expo_fb_thumb.jpg
- # images/flickr_fb_thumb.gif
- # images/footer_fill_fb_thumb.jpg
- # images/form_edit_fill_fb_thumb.jpg
- # images/form_fieldset_fill_fb_thumb.gif
- # images/header_bottom_fill_fb_thumb.jpg
- # images/header_fill_fb_thumb.jpg
- # images/header_panel_close_fb_thumb.png
- # images/header_panel_en_fb_thumb.gif
- # images/header_panel_fill_fb_thumb.jpg
- # images/header_panel_persona_fb_thumb.png
- # images/header_panel_ru_fb_thumb.gif
- # images/header_panel_search_fb_thumb.png
- # images/header_panel_separation_fb_thumb.jpg
- # images/header_panel_sub_fill_fb_thumb.jpg
- # images/invite_fill_fb_thumb.png
- # images/live_internet_fb_thumb.gif
- # images/logo_fb_thumb.png
- # images/logo_old.png
- # images/logo_old_fb_thumb.png
- # images/marker_blue_fb_thumb.gif
- # images/marker_fb_thumb.gif
- # images/marker_red_fb_thumb.gif
- # images/marketing_week_100.gif
- # images/marketing_week_100_fb_thumb.gif
- # images/marketing_week_240.gif
- # images/marketing_week_240_fb_thumb.gif
- # images/menu_button_fill_fb_thumb.png
- # images/menu_fill_fb_thumb.jpg
- # images/menu_general_fill_fb_thumb.jpg
- # images/menu_logotype1_fb_thumb.png
- # images/menu_logotype2_fb_thumb.png
- # images/menu_marker_fb_thumb.png
- # images/menu_separation_fb_thumb.png
- # images/menu_shadow_fb_thumb.png
- # images/menu_sub_fill_fb_thumb.png
- # images/menu_wrapper_fill_fb_thumb.jpg
- # images/middle_fill_fb_thumb.jpg
- # images/ndt_1.jpg
- # images/ndt_10.jpg
- # images/ndt_10_fb_thumb.jpg
- # images/ndt_11.jpg
- # images/ndt_11_fb_thumb.jpg
- # images/ndt_12.jpg
- # images/ndt_12_fb_thumb.jpg
- # images/ndt_13.jpg
- # images/ndt_13_fb_thumb.jpg
- # images/ndt_14.jpg
- # images/ndt_14_fb_thumb.jpg
- # images/ndt_15.jpg
- # images/ndt_15_fb_thumb.jpg
- # images/ndt_1_1.jpg
- # images/ndt_1_1_fb_thumb.jpg
- # images/ndt_1_2.jpg
- # images/ndt_1_2_fb_thumb.jpg
- # images/ndt_1_fb_thumb.jpg
- # images/ndt_2.jpg
- # images/ndt_2_fb_thumb.jpg
- # images/ndt_3.jpg
- # images/ndt_3_fb_thumb.jpg
- # images/ndt_4.jpg
- # images/ndt_4_fb_thumb.jpg
- # images/ndt_5.jpg
- # images/ndt_5_fb_thumb.jpg
- # images/ndt_6.jpg
- # images/ndt_6_fb_thumb.jpg
- # images/ndt_7.jpg
- # images/ndt_7_fb_thumb.jpg
- # images/ndt_8.jpg
- # images/ndt_8_fb_thumb.jpg
- # images/ndt_9.jpg
- # images/ndt_9_fb_thumb.jpg
- # images/ndt_fb_thumb.jpg
- # images/ndt_logos4site-01.jpg
- # images/ndt_logos4site-01_fb_thumb.jpg
- # images/ndt_logos4site-02.jpg
- # images/ndt_logos4site-02_fb_thumb.jpg
- # images/ndt_logos4site-04.jpg
- # images/ndt_logos4site-04_fb_thumb.jpg
- # images/ndt_logos4site-05.jpg
- # images/ndt_logos4site-05_fb_thumb.jpg
- # images/ndt_logos4site-06.jpg
- # images/ndt_logos4site-06_fb_thumb.jpg
- # images/ndt_logos4site-07.jpg
- # images/ndt_logos4site-07_fb_thumb.jpg
- # images/ndt_logos4site-11.jpg
- # images/ndt_logos4site-11_fb_thumb.jpg
- # images/ndt_logos4site4-03.jpg
- # images/ndt_logos4site4-03_fb_thumb.jpg
- # images/ndt_video_2.jpg
- # images/ndt_video_2_fb_thumb.jpg
- # images/panel_caption_fill_fb_thumb.jpg
- # images/panel_fill_fb_thumb.jpg
- # images/panels_fill_fb_thumb.jpg
- # images/partner_ite_fb_thumb.png
- # images/partner_logotype_fb_thumb.png
- # images/partner_primexpo_fb_thumb.png
- # images/partner_rsl_fb_thumb.png
- # images/partner_ufi_fb_thumb.png
- # images/partners150x150.jpg
- # images/partners150x150_fb_thumb.jpg
- # images/resalts.png
- # images/resalts_fb_thumb.png
- # images/shokobox.jpg
- # images/shokobox_fb_thumb.jpg
- # images/slider_fill_fb_thumb.jpg
- # images/slider_list_marker_fb_thumb.gif
- # images/spectr.gif
- # images/spectr_1.gif
- # images/spectr_1_fb_thumb.gif
- # images/spectr_fb_thumb.gif
- # images/table_border_fb_thumb.gif
- # images/technoclean_eng.jpg
- # images/technoclean_eng_fb_thumb.jpg
- # images/technoclean_rus.jpg
- # images/technoclean_rus_fb_thumb.jpg
- # images/title_fill_fb_thumb.jpg
- # images/title_fill_fb_thumb.png
- # images/title_inner_undeline_fb_thumb.jpg
- # images/title_mini_undeline_fb_thumb.jpg
- # images/title_mini_undeline_fb_thumb.png
- # images/title_sidebar_fill_fb_thumb.jpg
- # images/title_undeline_fb_thumb.jpg
- # images/youtube_fb_thumb.gif
- # individ_registr/
- # kjgkjh.png
- # kjgkjh_fb_thumb.png
- # main1.css
- # metaprom-logo.png
- # metaprom-logo_fb_thumb.png
- # ndt-seminar-13-240x420-01.png
- # ndt-seminar-13-240x420-01_fb_thumb.png
- # ndt-seminar-13-420x240-01.png
- # ndt-seminar-13-420x240-01_fb_thumb.png
- # ndt-siberia-13-184x40.tif
- # ndt-siberia-13-184x40_fb_thumb.tif
- # ndt_2014_eng.doc
- # ndt_2014_rus.doc
- # ndt_hotel_2014_rus.doc
- # ndt_hotel__2014_eng.doc
- # ndt_journal_1.swf
- # ndt_siberia_eng.doc
- # ndt_siberia_rus.doc
- # otzivi_knopka.png
- # otzivi_knopka_fb_thumb.png
- # part1.png
- # part1_fb_thumb.png
- # podrobnee.png
- # podrobnee_fb_thumb.png
- # pozdre.png
- # pozdre_fb_thumb.png
- # runeft.png
- # runeft_fb_thumb.png
- # runeft_portal.png
- # runeft_portal_fb_thumb.png
- # sec.ru.png
- # sec.ru_fb_thumb.png
- # spbtpp.png
- # spbtpp_fb_thumb.png
- # sticker.png
- # sticker_fb_thumb.png
- # ushast_knopka.png
- # ushast_knopka_fb_thumb.png
- # xghnxfgh.png
- # xghnxfgh_fb_thumb.png
- # "\320\276\321\202\321\207\320\265\321\202_\320\276\321\202_\320\260\321\200\321\202\320\265\320\274\321\214\320\265\320\262\320\260.doc"
- # "\320\276\321\202\321\207\320\265\321\202_\320\276\321\202_\320\272\321\203\320\267\320\265\320\273\320\265\320\262\320\260_.doc"
- nothing added to commit but untracked files present (use "git add" to track)
- User: [14] admin
- Additional data:
- None
- Request: ,
- POST:,
- COOKIES:{'_ga': 'GA1.2.219004234.1410954121',
- '_ym_visorc_23177689': 'w',
- 'csrftoken': 'oyG6m3gmr62VycR6oKPR0wh8N4JlihRl',
- 'sessionid': 'zb2yplljudhsuv2g4fymopgm4l5ql7tc'},
- META:{'CONTENT_LENGTH': '323',
- 'CONTENT_TYPE': 'application/x-www-form-urlencoded',
- u'CSRF_COOKIE': u'oyG6m3gmr62VycR6oKPR0wh8N4JlihRl',
- 'HTTP_ACCEPT': 'text/html,application/xhtml+xml,application/xml;q=0.9,image/webp,*/*;q=0.8',
- 'HTTP_ACCEPT_ENCODING': 'gzip,deflate',
- 'HTTP_ACCEPT_LANGUAGE': 'ru-RU,ru;q=0.8,en-US;q=0.6,en;q=0.4',
- 'HTTP_CACHE_CONTROL': 'max-age=0',
- 'HTTP_CONNECTION': 'close',
- 'HTTP_COOKIE': '_ga=GA1.2.219004234.1410954121; sessionid=zb2yplljudhsuv2g4fymopgm4l5ql7tc; _ym_visorc_23177689=w; csrftoken=oyG6m3gmr62VycR6oKPR0wh8N4JlihRl',
- 'HTTP_HOST': 'ndt-russia.building-exhibitions.ru',
- 'HTTP_ORIGIN': 'http://ndt-russia.building-exhibitions.ru',
- 'HTTP_REFERER': 'http://ndt-russia.building-exhibitions.ru/ru/local-admin/templates/status',
- 'HTTP_USER_AGENT': 'Mozilla/5.0 (Windows NT 6.1; WOW64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/37.0.2062.120 Safari/537.36',
- 'HTTP_VIA': '1.1 localhost (squid/3.1.6)',
- 'HTTP_X_FORWARDED_FOR': '10.50.24.15, 194.67.4.180,10.50.24.15, 194.67.4.180',
- 'HTTP_X_FORWARDED_HOST': 'ndt-russia.building-exhibitions.ru',
- 'HTTP_X_FORWARDED_PROTO': 'http',
- 'HTTP_X_REAL_IP': '194.67.4.180',
- 'PATH_INFO': u'/ru/local-admin/templates/action',
- 'QUERY_STRING': '',
- 'RAW_URI': '/ru/local-admin/templates/action',
- 'REMOTE_ADDR': '194.67.4.180',
- 'REMOTE_PORT': '80',
- 'REQUEST_METHOD': 'POST',
- 'SCRIPT_NAME': u'',
- 'SERVER_NAME': 'ndt-russia.building-exhibitions.ru',
- 'SERVER_PORT': '80',
- 'SERVER_PROTOCOL': 'HTTP/1.0',
- 'SERVER_SOFTWARE': 'gunicorn/0.17.4',
- 'gunicorn.socket': ,
- 'wsgi.errors': ,
- 'wsgi.file_wrapper': ,
- 'wsgi.input': ,
- 'wsgi.multiprocess': False,
- 'wsgi.multithread': False,
- 'wsgi.run_once': False,
- 'wsgi.url_scheme': 'http',
- 'wsgi.version': (1, 0)}>
Advertisement
Add Comment
Please, Sign In to add comment
Advertisement