Checkmk git commits February 2017

checkmk-commits@lists.checkmk.com

10 participants
452 discussions

Lower build parallelism, it hurts more than it helps.

by Sven Panne

Module: check_mk Branch: master Commit: b9e4ed8b6f037a436191170f0b51273b61698250 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b9e4ed8b6f037a… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Wed Feb 15 14:27:13 2017 +0100 Lower build parallelism, it hurts more than it helps. Change-Id: Ia655d4f5e72327f56e4889e5505a624125a46eef --- Makefile | 8 ++++---- livestatus/.f12 | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Makefile b/Makefile index a855a86..ce33481 100644 --- a/Makefile +++ b/Makefile @@ -257,8 +257,8 @@ cmc-$(VERSION).tar.gz: config.h enterprise/.werks/werks enterprise/ChangeLog rm -rf cmc-$(VERSION) build: config.h - LANG=C $(MAKE) -C livestatus -j8 - LANG=C $(MAKE) -C enterprise/core -j8 + LANG=C $(MAKE) -C livestatus -j2 + LANG=C $(MAKE) -C enterprise/core -j2 $(MAKE) -C enterprise/locale all install: @@ -450,10 +450,10 @@ GTAGS: config.h compile_commands.json: config.h $(FILES_TO_FORMAT) $(MAKE) -C livestatus clean - $(BEAR) $(MAKE) -C livestatus -j8 + $(BEAR) $(MAKE) -C livestatus -j4 ifeq ($(ENTERPRISE),yes) $(MAKE) -C enterprise/core clean - $(BEAR) --append $(MAKE) -C enterprise/core -j8 + $(BEAR) --append $(MAKE) -C enterprise/core -j4 endif tidy: compile_commands.json diff --git a/livestatus/.f12 b/livestatus/.f12 index eb395b2..577eb6d 100755 --- a/livestatus/.f12 +++ b/livestatus/.f12 @@ -5,7 +5,7 @@ SITE=${SITE:-$(cat ../.site 2>/dev/null || true)} SITE=${SITE:-$(omd sites --bare | head -n 1)} LANG=C make -C .. config.h -LANG=C make -j8 +LANG=C make -j4 sudo install src/livestatus.o /omd/sites/$SITE/lib/mk-livestatus/livestatus.o (cd api/python ; bash .f12 )

7 years, 7 months

Another try to fix the cee changelog deployment

by Lars Michelsen

Module: check_mk Branch: master Commit: 4964d9bc893e38ea9b51b13679b1a7f066bc7195 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=4964d9bc893e38… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Feb 15 12:03:21 2017 +0100 Another try to fix the cee changelog deployment Change-Id: I9e57e89854c626408ea150f7b0dd8b115129d9f3 --- Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 162d9ef..a855a86 100644 --- a/Makefile +++ b/Makefile @@ -251,7 +251,7 @@ cmc-$(VERSION).tar.gz: config.h enterprise/.werks/werks enterprise/ChangeLog mv cmc-$(VERSION)/enterprise/skel{,.permissions} cmc-$(VERSION) mv cmc-$(VERSION)/enterprise/LIVEPROXYD.hook cmc-$(VERSION) cp enterprise/.werks/werks cmc-$(VERSION)/werks - cp enterprise/ChangeLog cmc-$(VERSION)/ChangeLog + cp enterprise/ChangeLog cmc-$(VERSION)/ChangeLog-cmc sed -i '1 i\include ../../Makefile.omd' cmc-$(VERSION)/Makefile cd cmc-$(VERSION) && tar czf ../cmc-$(VERSION).tar.gz $(TAROPTS) .bugs * rm -rf cmc-$(VERSION) @@ -292,7 +292,7 @@ install: mkdir -p $(DESTDIR)$(OMD_ROOT)/lib/nagios/plugins install -m 755 enterprise/active_checks/check_lql_service $(DESTDIR)$(OMD_ROOT)/lib/nagios/plugins mkdir -p $(DESTDIR)$(OMD_ROOT)/share/doc/check_mk_enterprise - install -m 644 ChangeLog enterprise/EULA-* $(DESTDIR)$(OMD_ROOT)/share/doc/check_mk_enterprise/ + install -m 644 ChangeLog-cmc enterprise/EULA-* $(DESTDIR)$(OMD_ROOT)/share/doc/check_mk_enterprise/ mkdir -p $(DESTDIR)$(OMD_ROOT)/share/diskspace install -m 644 enterprise/diskspace $(DESTDIR)$(OMD_ROOT)/share/diskspace/check_mk_enterprise mkdir -p $(DESTDIR)$(OMD_ROOT)/share/check_mk/werks

7 years, 7 months

Testcommit

by Lars Michelsen

Module: check_mk Branch: master Commit: 245e7f7748f0623a07119f98f594bae067d9c6c2 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=245e7f7748f062… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Feb 15 11:49:02 2017 +0100 Testcommit Change-Id: I2ff3bb83b4a48e434ebc67085efc9630749d20d6 --- livestatus/Makefile.am | 1 + 1 file changed, 1 insertion(+) diff --git a/livestatus/Makefile.am b/livestatus/Makefile.am index a84ab0b..5874479 100644 --- a/livestatus/Makefile.am +++ b/livestatus/Makefile.am @@ -22,4 +22,5 @@ # to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, # Boston, MA 02110-1301 USA. + SUBDIRS = src

7 years, 7 months

Fixed source path of enterprise ChangeLog

by Lars Michelsen

Module: check_mk Branch: master Commit: d331fcf501dac5ba7a05fe0d5940fffa44739b22 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d331fcf501dac5… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Feb 15 11:27:00 2017 +0100 Fixed source path of enterprise ChangeLog Change-Id: If416ce1c3c5f89bd779f817bc4731bba97dc8af3 --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 3a78548..162d9ef 100644 --- a/Makefile +++ b/Makefile @@ -292,7 +292,7 @@ install: mkdir -p $(DESTDIR)$(OMD_ROOT)/lib/nagios/plugins install -m 755 enterprise/active_checks/check_lql_service $(DESTDIR)$(OMD_ROOT)/lib/nagios/plugins mkdir -p $(DESTDIR)$(OMD_ROOT)/share/doc/check_mk_enterprise - install -m 644 enterprise/ChangeLog enterprise/EULA-* $(DESTDIR)$(OMD_ROOT)/share/doc/check_mk_enterprise/ + install -m 644 ChangeLog enterprise/EULA-* $(DESTDIR)$(OMD_ROOT)/share/doc/check_mk_enterprise/ mkdir -p $(DESTDIR)$(OMD_ROOT)/share/diskspace install -m 644 enterprise/diskspace $(DESTDIR)$(OMD_ROOT)/share/diskspace/check_mk_enterprise mkdir -p $(DESTDIR)$(OMD_ROOT)/share/check_mk/werks

7 years, 7 months

Revert "Removed needless file copy during install"

by Lars Michelsen

Module: check_mk Branch: master Commit: 04c3998bcca88642ab15b0cead7c895eb26698d0 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=04c3998bcca886… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Feb 15 11:26:08 2017 +0100 Revert "Removed needless file copy during install" This reverts commit 84ea021eaa172af3a8d893825d9eb105aa1f5ed8. --- Makefile | 1 + 1 file changed, 1 insertion(+) diff --git a/Makefile b/Makefile index b630659..3a78548 100644 --- a/Makefile +++ b/Makefile @@ -251,6 +251,7 @@ cmc-$(VERSION).tar.gz: config.h enterprise/.werks/werks enterprise/ChangeLog mv cmc-$(VERSION)/enterprise/skel{,.permissions} cmc-$(VERSION) mv cmc-$(VERSION)/enterprise/LIVEPROXYD.hook cmc-$(VERSION) cp enterprise/.werks/werks cmc-$(VERSION)/werks + cp enterprise/ChangeLog cmc-$(VERSION)/ChangeLog sed -i '1 i\include ../../Makefile.omd' cmc-$(VERSION)/Makefile cd cmc-$(VERSION) && tar czf ../cmc-$(VERSION).tar.gz $(TAROPTS) .bugs * rm -rf cmc-$(VERSION)

7 years, 7 months

Cleaning up test classes.

by Roland Halbig

Module: check_mk Branch: master Commit: b23f73cfde61f05256d0754c1732d06e46a54402 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b23f73cfde61f0… Author: Roland Halbig <rh(a)mathias-kettner.de> Date: Thu Feb 9 15:52:22 2017 +0100 Cleaning up test classes. Change-Id: Ia5e5ba3e0e19f4f65c48a2928c99d04d8e001b4c --- tests/web/class_deprecated_renderer.py | 760 +++++++++++++++++++++++++++++ tests/web/classes.py | 752 +--------------------------- tests/web/html_tests.py | 2 +- tests/web/test_escaping.py | 8 +- tests/web/test_integration.py | 5 +- tests/web/tools.py | 23 +- tests/web/unittest_files/test_1.unittest | 6 +- tests/web/unittest_files/test_2.unittest | 6 +- tests/web/unittest_files/test_3.unittest | 64 +-- tests/web/unittest_generation/README.md | 30 ++ tests/web/unittest_generation/help.testgen | 3 + 11 files changed, 829 insertions(+), 830 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=b23f73cfde…

7 years, 7 months

Removed needless file copy during install

by Lars Michelsen

Module: check_mk Branch: master Commit: 84ea021eaa172af3a8d893825d9eb105aa1f5ed8 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=84ea021eaa172a… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Feb 15 10:39:19 2017 +0100 Removed needless file copy during install Change-Id: Iac249640f4b66cff23a1141facfa16964bc7d215 --- Makefile | 1 - 1 file changed, 1 deletion(-) diff --git a/Makefile b/Makefile index 3a78548..b630659 100644 --- a/Makefile +++ b/Makefile @@ -251,7 +251,6 @@ cmc-$(VERSION).tar.gz: config.h enterprise/.werks/werks enterprise/ChangeLog mv cmc-$(VERSION)/enterprise/skel{,.permissions} cmc-$(VERSION) mv cmc-$(VERSION)/enterprise/LIVEPROXYD.hook cmc-$(VERSION) cp enterprise/.werks/werks cmc-$(VERSION)/werks - cp enterprise/ChangeLog cmc-$(VERSION)/ChangeLog sed -i '1 i\include ../../Makefile.omd' cmc-$(VERSION)/Makefile cd cmc-$(VERSION) && tar czf ../cmc-$(VERSION).tar.gz $(TAROPTS) .bugs * rm -rf cmc-$(VERSION)

7 years, 7 months

Removed changelog

by Lars Michelsen

Module: check_mk Branch: master Commit: 76a3f5c8d52dfe3edcfd4f4d8bff940d9edc36af URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=76a3f5c8d52dfe… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Feb 15 10:20:11 2017 +0100 Removed changelog Change-Id: Iaf713b770556e62d02caf385e1d4777b132f0e28 --- ChangeLog | 8995 ------------------------------------------------------------- 1 file changed, 8995 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=76a3f5c8d5…

7 years, 7 months

4368 FIX User password were deleted when saving users without setting a new password

by Lars Michelsen

Module: check_mk Branch: master Commit: fa9796448c0ffd2fc5de94c83d159ea1489a97cd URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=fa9796448c0ffd… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Feb 15 10:26:44 2017 +0100 4368 FIX User password were deleted when saving users without setting a new password Change-Id: I21bc33aff70c1b799e5ee323678e446070f36dc8 --- .werks/4368 | 9 +++++++++ web/htdocs/wato.py | 2 -- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/.werks/4368 b/.werks/4368 new file mode 100644 index 0000000..24518ed --- /dev/null +++ b/.werks/4368 @@ -0,0 +1,9 @@ +Title: User password were deleted when saving users without setting a new password +Level: 1 +Component: wato +Compatible: compat +Version: 1.5.0i1 +Date: 1487150776 +Class: fix + + diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 34c0411..cce72d4 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -10429,8 +10429,6 @@ def mode_edit_user(phase): if password2 and password != password2: raise MKUserError("password2", _("The both passwords do not match.")) - user_attrs["password"] = password - # Detect switch back from automation to password if "automation_secret" in user_attrs: del user_attrs["automation_secret"]

7 years, 7 months

Removed textual changelog from git

by Lars Michelsen

Module: check_mk Branch: master Commit: ea0240f3bbdccb79f92fa5a813697342d79283dd URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ea0240f3bbdccb… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Feb 15 10:03:06 2017 +0100 Removed textual changelog from git The changelog was generated from the werks before and commited together with the werks and the changes which resulted in a lot of merge conflicts during development/reviews. We have now decided to only generate the changelog during releases. You can check out the werk lists at any time to see the changes we have made to Check_MK. Please check out the list of changes on our website (http://mathias-kettner.de/check_mk_werks.php?HTML=yes), see the werk list in your installaion (click on version number in sidebar) or run the "./werk list" command from the git directory of Check_MK. Change-Id: Ifa2b17349e4a4665fb3bc10d9b4c033ccdcf03a2 --- .gitignore | 1 + CHANGES | 17 + ChangeLog.in | 4804 +++++++++++++++++++++ Makefile | 19 +- lib/werks.py | 125 +- scripts/create-changelog.py | 78 + scripts/{precompile-werks => precompile-werks.py} | 0 web/htdocs/werks.py | 133 +- werk | 92 +- 9 files changed, 5054 insertions(+), 215 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=ea0240f3bb…

7 years, 7 months

← Newer
1
...
19
20
21
22
23
24
25
...
46
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits February 2017