[icinga-checkins] icinga.org: icinga2/fix/add-missing-suse-build-requirement-7741: Fix the reduce/reduce conflicts

git at icinga.org git at icinga.org
Tue Nov 25 12:10:22 CET 2014


Module: icinga2
Branch: fix/add-missing-suse-build-requirement-7741
Commit: d366dd8e30218702d0b2dba917ca4a247100eac1
URL:    https://git.icinga.org/?p=icinga2.git;a=commit;h=d366dd8e30218702d0b2dba917ca4a247100eac1

Author: Gunnar Beutner <gunnar.beutner at netways.de>
Date:   Sun Nov 23 15:20:51 2014 +0100

Fix the reduce/reduce conflicts

refs #7800

---

 lib/config/config_parser.yy      |   44 +++++++++--------
 lib/config/configitembuilder.cpp |    5 +-
 lib/config/expression.cpp        |   21 +++++++--
 lib/config/expression.hpp        |   14 ++++--
 lib/config/vmops.hpp             |   96 ++++++++++++++++++++------------------
 test/config-ops.cpp              |    3 +-
 6 files changed, 105 insertions(+), 78 deletions(-)

Diff:   https://git.icinga.org/?p=icinga2.git;a=commitdiff;h=d366dd8e30218702d0b2dba917ca4a247100eac1


More information about the icinga-checkins mailing list