diff options
| author | mcorino <mcorino@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2011-04-09 17:53:42 +0000 |
|---|---|---|
| committer | mcorino <mcorino@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2011-04-09 17:53:42 +0000 |
| commit | 62904f74955373ff396b6e2a58e09a601c65f52e (patch) | |
| tree | e9a2a0150a2f19216a2279939099287759345faa /DAnCE | |
| parent | 2a51a0c99f2809e03fe5f7dd7fde446d50096862 (diff) | |
| download | ATCD-62904f74955373ff396b6e2a58e09a601c65f52e.tar.gz | |
Sat Apr 9 17:47:00 UTC 2011 Martin Corino <mcorino@remedy.nl>
Merged changes from Remedy work branch.
Diffstat (limited to 'DAnCE')
| -rw-r--r-- | DAnCE/ChangeLog | 14 | ||||
| -rw-r--r-- | DAnCE/dance/DomainApplicationManager/Node_Locator.cpp | 2 |
2 files changed, 15 insertions, 1 deletions
diff --git a/DAnCE/ChangeLog b/DAnCE/ChangeLog index 37fb2721d28..78ca5cd5ed7 100644 --- a/DAnCE/ChangeLog +++ b/DAnCE/ChangeLog @@ -1,3 +1,17 @@ +Sat Apr 9 17:47:00 UTC 2011 Martin Corino <mcorino@remedy.nl> + + Merged changes from Remedy work branch. + + === start changelog === + + Thu Apr 7 12:24:30 UTC 2011 Marcel Smit <msmit@remedy.nl> + + * dance/DomainApplicationManager/Node_Locator.cpp: + Removed comma after DLINFO in a log message. Therefor the message + will be logged properly. + + === end changelog === + Sat Apr 9 11:36:47 UTC 2011 William R. Otte <wotte@dre.vanderbilt.edu> * dance/LocalityManager/Daemon/Locality_Manager_Impl.cpp: diff --git a/DAnCE/dance/DomainApplicationManager/Node_Locator.cpp b/DAnCE/dance/DomainApplicationManager/Node_Locator.cpp index 5d03d39b5e7..d5464526888 100644 --- a/DAnCE/dance/DomainApplicationManager/Node_Locator.cpp +++ b/DAnCE/dance/DomainApplicationManager/Node_Locator.cpp @@ -217,7 +217,7 @@ namespace DAnCE resources[i].resourceType[k]) == 0) { DANCE_DEBUG (DANCE_LOG_EVENT_TRACE, - (LM_TRACE, DLINFO, + (LM_TRACE, DLINFO ACE_TEXT("Node_Locator::get_resource_value - ") ACE_TEXT("Found resource for type '%C'\n"), type)); |