Skip to content
Merged
Changes from 1 commit
Commits
Show all changes
26 commits
Select commit Hold shift + click to select a range
b4e3843
Apply JRF resources to dynamic cluster
CarolynRountree Mar 18, 2019
c0a08ce
Merge branch 'master' into WDT-228-target-dynamic-servers-to-cluster
CarolynRountree Mar 22, 2019
e4c2c24
Merge branch 'master' into WDT-228-target-dynamic-servers-to-cluster
CarolynRountree Mar 22, 2019
1b9c11a
Add troubleshooting message for applyJRF
CarolynRountree Mar 22, 2019
e85a241
Merge branch 'master' into WDT-228-target-dynamic-servers-to-cluster
CarolynRountree Mar 22, 2019
285f19a
intermediate checkins
CarolynRountree Mar 25, 2019
1c4800b
Merge branch 'master' into WDT-228-target-dynamic-servers-to-cluster
CarolynRountree Mar 25, 2019
4a09ad9
Merge branch 'master' into WDT-228-target-dynamic-servers-to-cluster
CarolynRountree Mar 25, 2019
a9aa349
assign JRF resources using applyJRF
CarolynRountree Mar 27, 2019
86b7bb1
Merge branch 'master' into WDT-228-target-dynamic-servers-to-cluster
CarolynRountree Mar 27, 2019
ae9c16e
Merge branch 'master' into WDT-228-target-dynamic-servers-to-cluster
CarolynRountree Apr 1, 2019
f0abc7f
Merge branch 'master' into WDT-228-target-dynamic-servers-to-cluster
CarolynRountree Apr 1, 2019
5a8af7d
One working approach
CarolynRountree Apr 15, 2019
cc8957d
Add rearrangement of execution of targeting
CarolynRountree Apr 15, 2019
2e6f9d2
Checkin cleanups
CarolynRountree Apr 15, 2019
db0a172
fixes for exception issue message
CarolynRountree Apr 15, 2019
3234c17
Fixes for 10.3.6 testing
CarolynRountree Apr 16, 2019
0f0b6ca
cleanup
CarolynRountree Apr 17, 2019
594f668
Revert "cleanup"
CarolynRountree Apr 17, 2019
eaeecd3
Merge branch 'WDT-228-target-dynamic-servers-to-cluster' of github.co…
CarolynRountree Apr 17, 2019
4990c4b
Merge branch 'master' into WDT-228-target-dynamic-servers-to-cluster
CarolynRountree Apr 17, 2019
1d6e4b1
WDT-228 Remove archive file from repository
CarolynRountree Apr 17, 2019
ad00fd5
clarify warning message 12244
ddsharpe Apr 17, 2019
ab43188
changed warning message 9701
ddsharpe Apr 17, 2019
364cef5
Merge master and test. Add new check for RestrictedJRF and change met…
CarolynRountree Apr 18, 2019
62de3c3
Merge branch 'WDT-228-target-dynamic-servers-to-cluster' of github.co…
CarolynRountree Apr 18, 2019
File filter

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Merge branch 'master' into WDT-228-target-dynamic-servers-to-cluster
  • Loading branch information
CarolynRountree committed Mar 25, 2019
commit 1c4800bdba53d7336350e6c7874600f59ef3d9fd
Original file line number Diff line number Diff line change
Expand Up @@ -114,7 +114,7 @@ def update(self):
if self.wls_helper.is_set_server_groups_supported():
server_groups_to_target = self._domain_typedef.get_server_groups_to_target()
self.target_helper.target_server_groups_to_servers(server_groups_to_target)
else:
elif self._domain_typedef.domain_type_has_jrf_resources():
# Don't apply JRF resources to domains for a domain type which does not include JRF
self._wlst_helper.save_and_close(self.model_context)
self.target_helper.target_jrf_groups_to_clusters_servers(self.model_context)
Expand Down
You are viewing a condensed version of this merge commit. You can view the full changes here.