Project

General

Profile

Activity

From 2017-02-11 to 2017-02-11

2017-02-11

16:51 Revision 9aaf934b (rudder): Merge branch 'branches/rudder/4.1'
Conflicts:
pom.xml
rudder-core/pom.xml
rudder-templates-cli/pom.xml
rudder-templates/pom.xml
rudder-web/pom.xml
Nicolas CHARLES
16:51 Revision c6c90dca (rudder): Merge branch 'branches/rudder/4.1'
Conflicts:
pom.xml
rudder-core/pom.xml
rudder-templates-cli/pom.xml
rudder-templates/pom.xml
rudder-web/pom.xml
Nicolas CHARLES
16:29 Revision 2a7abb26 (rudder): Merge branch 'branches/rudder/4.0' into branches/rudder/4.1
Nicolas CHARLES
16:29 Revision 83e74bd4 (rudder): Merge branch 'branches/rudder/4.0' into branches/rudder/4.1
Nicolas CHARLES
16:28 Revision 283cdb31 (rudder): Merge branch 'branches/rudder/3.2' into branches/rudder/4.0
Conflicts:
rudder-core/src/main/scala/com/normation/rudder/repository/jdbc/ReportsJdbcRepository.scala
Nicolas CHARLES
16:28 Revision 242716d2 (rudder): Merge branch 'branches/rudder/3.2' into branches/rudder/4.0
Conflicts:
rudder-core/src/main/scala/com/normation/rudder/repository/jdbc/ReportsJdbcRepository.scala
Nicolas CHARLES
15:57 Bug #10171 (Pending release): If the Rudder Web Interface is interrupted during the second step of reports archiving, then it won't never succeed in archiving again
Applied in changeset commit:rudder|43cab768de9344e51d75e70fa1a5f5028a887099. Nicolas CHARLES
15:56 Revision 2a0603c2 (rudder): Merge branch 'branches/rudder/3.1' into branches/rudder/3.2
Nicolas CHARLES
15:56 Revision 6a527fc5 (rudder): Merge branch 'branches/rudder/3.1' into branches/rudder/3.2
Nicolas CHARLES
15:56 Revision 21bce7b7 (rudder): Merge branch 'bug_10171/if_the_rudder_web_interface_is_interrupted_during_the_second_step_of_reports_archiving_then_it_won_t_never_succeed_in_archiving_again_pr' into branches/rudder/3.1
Nicolas CHARLES
15:56 Revision 1490bd4b (rudder): Merge branch 'bug_10171/if_the_rudder_web_interface_is_interrupted_during_the_second_step_of_reports_archiving_then_it_won_t_never_succeed_in_archiving_again_pr' into branches/rudder/3.1
Nicolas CHARLES
15:43 Revision 93da9563 (ncf): Merge branch 'v1.0'
Nicolas Charles
15:41 Revision f74fb06b (ncf): Merge branch 'v0.x' into v1.0
Conflicts:
tree/30_generic_methods/file_ensure_key_value_present_in_ini_section.cf
Nicolas Charles
15:39 Bug #10153 (Pending release): Calling twice file_ensure_key_value_present_in_ini_section for same file and section doesn't do anything for the second call
Applied in changeset commit:20ff7bae0bc809546c357b5f894467f82c992a0e. Nicolas CHARLES
10:09 Revision be9c5fbb (rudder): Change version of pom.xml to 4.1.0~beta4-SNAPSHOT
Jenkins CI
10:09 Revision ec4eb45c (rudder): Change version of pom.xml to 4.1.0~beta4-SNAPSHOT
Jenkins CI
10:09 Revision ca508603 (rudder): Change version of pom.xml to 4.1.0~beta4-SNAPSHOT
Jenkins CI
10:09 Revision 3debc74a (rudder): Change version of pom.xml to 4.1.0~beta4-SNAPSHOT
Jenkins CI
10:09 Revision e1a84b3b (rudder): Change version of pom.xml to 4.1.0~beta4-SNAPSHOT
Jenkins CI
10:09 Revision 5a45f120 (rudder-plugins): Change version of pom.xml to 4.1.0~beta4-SNAPSHOT
Jenkins CI
10:09 Revision 1621db37 (rudder): Change version of pom.xml to 4.1.0~beta4-SNAPSHOT
Jenkins CI
10:09 Revision 3debc74a (ldap-inventory): Change version of pom.xml to 4.1.0~beta4-SNAPSHOT
Jenkins CI
10:09 Revision be9c5fbb (scala-ldap): Change version of pom.xml to 4.1.0~beta4-SNAPSHOT
Jenkins CI
10:09 Revision ec4eb45c (rudder-commons): Change version of pom.xml to 4.1.0~beta4-SNAPSHOT
Jenkins CI
10:09 Revision ca508603 (parent-pom): Change version of pom.xml to 4.1.0~beta4-SNAPSHOT
Jenkins CI
09:07 Bug #10180 (Pending release): Errors are silenced when contacting remote-run api
Applied in changeset commit:rudder|ce7c7ae766852fa7d8fdbcce5f928cab929171a9. François ARMAND
02:02 Bug #10180 (Pending technical review): Errors are silenced when contacting remote-run api
PR https://github.com/Normation/rudder/pull/1493 François ARMAND
01:52 Bug #10180 (Released): Errors are silenced when contacting remote-run api
We don't keep errors when contacting remote run API + s/toByte/getByte/ (toByte try to convert to one byte a digit, l... François ARMAND
09:07 Revision 2f4303f1 (rudder): Merge branch 'branches/rudder/4.1'
Normation GIT merger
09:07 Revision e1ef8694 (rudder): Merge branch 'branches/rudder/4.1'
Normation GIT merger
02:02 Revision 3b58bd3b (rudder): Fixes #10180: Errors are silenced when contacting remote-run api
François ARMAND
02:02 Revision ce7c7ae7 (rudder): Fixes #10180: Errors are silenced when contacting remote-run api
François ARMAND
00:47 Bug #10179 (Pending release): Reapply 10106 after change to scala 2.12/lift 3
Applied in changeset commit:rudder|b24a086f5fa9a13d0b70df7158eaaaa82eb248f4. Vincent MEMBRÉ
00:28 Bug #10179 (Pending technical review): Reapply 10106 after change to scala 2.12/lift 3
PR https://github.com/Normation/rudder/pull/1492 Vincent MEMBRÉ
00:26 Bug #10179 (In progress): Reapply 10106 after change to scala 2.12/lift 3
Vincent MEMBRÉ
00:24 Bug #10179 (Released): Reapply 10106 after change to scala 2.12/lift 3
Fix 10106 was reverted by 10127 reapplying should fix everything Vincent MEMBRÉ
00:47 Revision fa175147 (rudder): Merge branch 'branches/rudder/4.1'
Normation GIT merger
00:47 Revision 217f4b7b (rudder): Merge branch 'branches/rudder/4.1'
Normation GIT merger
00:37 Architecture #8171: Change graph lib to more efficent one
Work in progess here: https://github.com/VinceMacBuche/rudder/commit/cbe0450c6a76f25fab76b7712b0d21dd7f526b9d Vincent MEMBRÉ
00:36 Architecture #8171 (In progress): Change graph lib to more efficent one
Vincent MEMBRÉ
00:28 Revision 92578572 (rudder): Fixes #10179: Reapply 10106 after change to scala 2.12/lift 3
Vincent MEMBRÉ
00:28 Revision b24a086f (rudder): Fixes #10179: Reapply 10106 after change to scala 2.12/lift 3
Vincent MEMBRÉ
 

Also available in: Atom