Repository: trafficserver Updated Branches: refs/heads/master 4d2c262c3 -> c9b2241c4
TS-3960: fix a couple of merge errors Project: http://git-wip-us.apache.org/repos/asf/trafficserver/repo Commit: http://git-wip-us.apache.org/repos/asf/trafficserver/commit/c9b2241c Tree: http://git-wip-us.apache.org/repos/asf/trafficserver/tree/c9b2241c Diff: http://git-wip-us.apache.org/repos/asf/trafficserver/diff/c9b2241c Branch: refs/heads/master Commit: c9b2241c4faf4dbb2a706cf7d7e169252b14a3ed Parents: 4d2c262 Author: James Peach <[email protected]> Authored: Tue Dec 15 08:25:07 2015 -0800 Committer: James Peach <[email protected]> Committed: Tue Dec 15 08:25:07 2015 -0800 ---------------------------------------------------------------------- mgmt/FileManager.cc | 2 +- mgmt/Rollback.cc | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/trafficserver/blob/c9b2241c/mgmt/FileManager.cc ---------------------------------------------------------------------- diff --git a/mgmt/FileManager.cc b/mgmt/FileManager.cc index 7abac49..06b7cbb 100644 --- a/mgmt/FileManager.cc +++ b/mgmt/FileManager.cc @@ -640,7 +640,7 @@ FileManager::rereadConfig() for (entry = ink_hash_table_iterator_first(bindings, &iterator_state); entry != NULL; entry = ink_hash_table_iterator_next(bindings, &iterator_state)) { rb = (Rollback *)ink_hash_table_entry_value(bindings, entry); - if (rb->checkForUserUpdate(rb->isVersioned() ? ROLLBACK_CHECK_ONLY : ROLLBACK_CHECK_AND_UPDATE)) { + if (rb->checkForUserUpdate(rb->isVersioned() ? ROLLBACK_CHECK_AND_UPDATE : ROLLBACK_CHECK_ONLY)) { changedFiles.push_back(rb); if (rb->isChildRollback()) { parentFileNeedChange.add_exclusive(rb->getParentRollback()); http://git-wip-us.apache.org/repos/asf/trafficserver/blob/c9b2241c/mgmt/Rollback.cc ---------------------------------------------------------------------- diff --git a/mgmt/Rollback.cc b/mgmt/Rollback.cc index 13ba97d..e187e1b 100644 --- a/mgmt/Rollback.cc +++ b/mgmt/Rollback.cc @@ -45,7 +45,8 @@ const char *RollbackStrings[] = {"Rollback Ok", "File was not found", "Version w "Invalid Version - Version Numbers Must Increase"}; Rollback::Rollback(const char *fileName_, bool root_access_needed_, Rollback *parentRollback_, unsigned flags) - : configFiles(NULL), root_access_needed(root_access_needed_), parentRollback(parentRollback_) + : configFiles(NULL), root_access_needed(root_access_needed_), parentRollback(parentRollback_), + currentVersion(0), fileLastModified(0), numVersions(0), numberBackups(0) { version_t highestSeen; // the highest backup version ExpandingArray existVer(25, true); // Exsisting versions
