summaryrefslogtreecommitdiff
path: root/ACE/OCI_RE_ChangeLog
diff options
context:
space:
mode:
authorstanleyk <stanleyk@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>2013-02-05 19:22:25 +0000
committerstanleyk <stanleyk@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>2013-02-05 19:22:25 +0000
commit95e67cb9b08ec7dc1722329943d5c2d5e9f98e1a (patch)
treec3277f26100f7e48bc64aa32b5f62c57cd080672 /ACE/OCI_RE_ChangeLog
parent82beaca101dfb312bebfb4997d49b53848048584 (diff)
downloadATCD-OCI_Reliability_Enhancements.tar.gz
Merged trunk to OCI_RE_Changelog branch. Added OCI_RE_ChangeLog details in ChangeLog. Prepared for merge into trunk.OCI_Reliability_Enhancements
Diffstat (limited to 'ACE/OCI_RE_ChangeLog')
-rw-r--r--ACE/OCI_RE_ChangeLog6
1 files changed, 5 insertions, 1 deletions
diff --git a/ACE/OCI_RE_ChangeLog b/ACE/OCI_RE_ChangeLog
index f9290fcb4d8..65b27d8f9a4 100644
--- a/ACE/OCI_RE_ChangeLog
+++ b/ACE/OCI_RE_ChangeLog
@@ -1,3 +1,7 @@
+Tue Feb 5 18:06:34 UTC 2013 "Kevin Stanley" <stanleyk@ociweb.com>
+
+ * ChangeLog:
+
Tue Feb 5 17:01:48 UTC 2013 "Kevin Stanley" <stanleyk@ociweb.com>
* ace/Auto_Event.h:
@@ -8,7 +12,7 @@ Tue Feb 5 17:01:48 UTC 2013 "Kevin Stanley" <stanleyk@ociweb.com>
* protocols/ace/INet/FTP_Simple_exec.cpp:
* protocols/ace/INet/HTTP_Simple_exec.cpp:
- Merged changes from trunk in preparation for merge. The
+ Merged changes from trunk in preparation for merge. The
above files had changes.
Thu Jan 31 22:39:53 UTC 2013 Phillip LaBanca <labancap@ociweb.com>