Max Schenkelberg
|
ad32bbd91d
|
Issue #2142 Got log4j out of edex.
Amend: Removed deleted files from build.properties
Change-Id: Id6aad305848ce137eb7e26cf689e172f165211fa
Former-commit-id: cd88054e2b [formerly 94fa6f0e30] [formerly 63421a4819] [formerly cd88054e2b [formerly 94fa6f0e30] [formerly 63421a4819] [formerly 50825200a1 [formerly 63421a4819 [formerly f47d21972b86d8c2c757874c5e450f93e5704133]]]]
Former-commit-id: 50825200a1
Former-commit-id: f025c05d04 [formerly d1881ffa51] [formerly 2ff2a01be22c488169cf5231f7c69f9108a2bd0f [formerly 1610826d2e]]
Former-commit-id: a38fe0e4cd744ea32b4c88e97305cabc3dbac06f [formerly a47f187f4f]
Former-commit-id: 5ba50b4476
|
2013-07-15 14:26:15 -05:00 |
|
Richard Peter
|
ba88ac2d5c
|
Merge branch 'omaha_13.4.1' (13.4.1-13) into development
Conflicts:
cave/com.raytheon.viz.ui.personalities.awips/META-INF/MANIFEST.MF
edexOsgi/com.raytheon.uf.common.serialization/src/com/raytheon/uf/common/serialization/JAXBManager.java
edexOsgi/com.raytheon.uf.common.stats/src/com/raytheon/uf/common/stats/StatsRecord.java
edexOsgi/com.raytheon.uf.edex.stats/res/spring/edex-process-stats.xml
edexOsgi/com.raytheon.uf.edex.stats/res/spring/stats-graph-request.xml
edexOsgi/com.raytheon.uf.edex.stats/res/spring/stats-request.xml
edexOsgi/com.raytheon.uf.edex.stats/src/com/raytheon/uf/edex/stats/AggregateManager.java
edexOsgi/com.raytheon.uf.edex.stats/src/com/raytheon/uf/edex/stats/dao/AggregateRecordDao.java
edexOsgi/com.raytheon.uf.edex.stats/src/com/raytheon/uf/edex/stats/dao/StatsDao.java
tests/unit/com/raytheon/uf/edex/stats/AggregateManagerTest.java
Former-commit-id: c9c02248b3 [formerly f13177a981] [formerly 192e5b9be8] [formerly c9c02248b3 [formerly f13177a981] [formerly 192e5b9be8] [formerly 9e3baaa87a [formerly 192e5b9be8 [formerly ed63eaede59b2b8d388d6fa03394f5e8d91c51dd]]]]
Former-commit-id: 9e3baaa87a
Former-commit-id: a8780f26b5 [formerly 9c3fe01efa] [formerly 42622571fcb8725b87f8d30720e20cf788897ac5 [formerly ae09db35ad]]
Former-commit-id: 21adb9c78d59896133d2b3efcbf7dcafb108064e [formerly 13f64a7da8]
Former-commit-id: 22f6319986
|
2013-06-04 14:06:53 -05:00 |
|
Richard Peter
|
8d69735af5
|
Issue #1917: Update stat offline processing and add purge. Add batching of stat deleting and vacuum after every aggregation period.
Change-Id: Ia92ea7dd37202cdf3806529661588b776e98c47c
Former-commit-id: cbfe9772c5 [formerly d5c0b86b7a] [formerly b599745012] [formerly cbfe9772c5 [formerly d5c0b86b7a] [formerly b599745012] [formerly 7349808131 [formerly b599745012 [formerly a48084f6cd99a440fcaab025c0178cf1fa17c9bb]]]]
Former-commit-id: 7349808131
Former-commit-id: d4eb77b248 [formerly 53190601f6] [formerly 58c6245c0b25ac72406612c59ba4ec5f003980c0 [formerly f3e0966966]]
Former-commit-id: 7b9c4e5c34cbc503c4e1e2d503397fafc52e7632 [formerly c51e6750b4]
Former-commit-id: 62191a8d82
|
2013-05-23 11:50:34 -05:00 |
|
Benjamin Phillippe
|
e7ea63963d
|
Issue #1802 Refactored DD transaction management
Change-Id: Idec6238188f29f51f3738d2e40f95d6c562cfe39
Former-commit-id: 15f5bc0cad [formerly 4675bed4c2] [formerly b10b1150be] [formerly 15f5bc0cad [formerly 4675bed4c2] [formerly b10b1150be] [formerly af05feb5a7 [formerly b10b1150be [formerly 534777d96a45b275abd9cc26818b7df200974595]]]]
Former-commit-id: af05feb5a7
Former-commit-id: a8350c0129 [formerly 541646148b] [formerly 9e9ca757bac7ecb378e458d18fd7c0b249bdee76 [formerly 4d1a8805ab]]
Former-commit-id: edbdb2638e5a5abcb6d8adcfa785deaefe6a2f03 [formerly c250bda12b]
Former-commit-id: 5e50d32bdb
|
2013-03-25 15:15:38 -05:00 |
|
Steve Harris
|
745f2c6409
|
13.1.2-2 baseline
Former-commit-id: e8f4a2f031 [formerly 51208e5515] [formerly c0c1d56f3a] [formerly e8f4a2f031 [formerly 51208e5515] [formerly c0c1d56f3a] [formerly 4ba416aeb3 [formerly c0c1d56f3a [formerly 221d0aaf0e19a054387134e72a76a278159bf4d0]]]]
Former-commit-id: 4ba416aeb3
Former-commit-id: 82cdde8491 [formerly cd4185ef5c] [formerly 413d9d9811179a10639f756b8b4f690d86be7a6a [formerly 941337c553]]
Former-commit-id: c69e1900269e630aefc061c2464bc8fea1c9776a [formerly b6fa9b4858]
Former-commit-id: f52ec0b0a0
|
2013-01-06 14:32:24 -06:00 |
|