Merge branch '2.7rc' into 2.7.x

* 2.7rc:
  (#7624) Manually fetch all properties in instances.
  (#7193) Fix path issues with acceptance tests that call old shell tests
  (#7632) Make secret_agent application compatible with secret_agent face
  (#7624) Auditing should not be enabled by default for purged resources.

2 files changed, 2 insertions, 2 deletions

diff --git a/acceptance/tests/resource/service/ticket_4123_should_list_all_running_redhat.rb b/acceptance/tests/resource/service/ticket_4123_should_list_all_running_redhat.rb
index b4c2bc14d..9bedd6e04 100755
--- a/acceptance/tests/resource/service/ticket_4123_should_list_all_running_redhat.rb
+++ b/acceptance/tests/resource/service/ticket_4123_should_list_all_running_redhat.rb
@@ -7,6 +7,6 @@ hosts.each do |host|
   unless host['platform'].include? 'centos' or host['platform'].include? 'redhat'
     skip_test "Test not supported on this plaform" 
   else
-    run_script_on(host,'tests/acceptance/resource/service/ticket_4123_should_list_all_running_redhat.sh')
+    run_script_on(host,'acceptance-tests/tests/resource/service/ticket_4123_should_list_all_running_redhat.sh')
   end
 end
diff --git a/acceptance/tests/resource/service/ticket_4124_should_list_all_disabled.rb b/acceptance/tests/resource/service/ticket_4124_should_list_all_disabled.rb
index 4add108ff..db96ad91c 100755
--- a/acceptance/tests/resource/service/ticket_4124_should_list_all_disabled.rb
+++ b/acceptance/tests/resource/service/ticket_4124_should_list_all_disabled.rb
@@ -7,6 +7,6 @@ hosts.each do |host|
   unless host['platform'].include? 'centos' or host['platform'].include? 'redhat'
     skip_test "Test not supported on this plaform"
    else
-    run_script_on(host,'tests/acceptance/resource/service/ticket_4124_should_list_all_disabled.sh')
+    run_script_on(host,'acceptance-tests/tests/resource/service/ticket_4124_should_list_all_disabled.sh')
   end
 end