Commit graph

13 commits

Author SHA1 Message Date
Nate Jensen
53f994c0a8 Issue #1989 remove dead files
Change-Id: I21e955cc4ebf98f75d26d46f95c2e889c64d1266

Former-commit-id: 9f8654e4ff [formerly 1ecdd989df] [formerly ce2579a289 [formerly 354c2f6a304bb48d82243daf2e80236f7fe05a54]]
Former-commit-id: ce2579a289
Former-commit-id: 04c7c4a4da
2013-05-16 10:25:38 -05:00
Nate Jensen
65fdf84101 Issue #1989 fix build
Change-Id: Icf0aa054d2f71711f36e937cd48abeee66148a89

Former-commit-id: 0c718e1cd1 [formerly 5280b54277] [formerly 4e63b88031 [formerly 7ea9c266c80a92c14430ed32825c9bd340655d12]]
Former-commit-id: 4e63b88031
Former-commit-id: 1e059ee8d9
2013-05-15 09:22:16 -05:00
Nate Jensen
dac803ca07 Issue #1989 upgrade camel to 2.11, spring to 3.4.1, and fix edex messages
Change-Id: I02d31a348c34aee48271dad291ae0f074e8e5158

Former-commit-id: 1fcbeb41c9 [formerly 08b9ce4c62] [formerly 6f1684b85c [formerly 61921c6a5d4ae8d7e6b2546a11fb7407f780830f]]
Former-commit-id: 6f1684b85c
Former-commit-id: 22c23492c4
2013-05-14 16:16:13 -05:00
Steve Harris
d00dc0d174 Merge branch 'omaha_13.3.1' into development
Conflicts (auto resolved):
	cave/com.raytheon.uf.viz.cots.feature/feature.xml
	edexOsgi/com.raytheon.uf.edex.cots.feature/feature.xml


Former-commit-id: 310474ae9b [formerly 36df63be5c] [formerly cb5ea76f98 [formerly 45de49bd241f4bc53b266792c0ae6cb4658527a7]]
Former-commit-id: cb5ea76f98
Former-commit-id: 104e6e79e8
2013-03-20 13:45:11 -05:00
Ben Steffensmeier
b201d9dee2 Issue #1804 Switch bzip2 cots package to jbzip2.
Former-commit-id: 0d9119a1c7 [formerly 2b6aa86371] [formerly ed544fc17c [formerly d3a05862f3ff84d8ccadf3838279741ba7153adf]]
Former-commit-id: ed544fc17c
Former-commit-id: 646b61f653
2013-03-20 13:05:54 -05:00
Max Schenkelberg
fc58e7431a Issue #1638 Create base edex and common features that can be deployed to startup a base edex instance
Change-Id: I3f336969a48764785ac148c9d67799e228e66d62

Former-commit-id: 1769edc026 [formerly ec40d261e5] [formerly 547c593dec [formerly 108a140d0b203680ed00e9c81b9271a5873ce8df]]
Former-commit-id: 547c593dec
Former-commit-id: 13a4056335
2013-02-27 16:19:58 -06:00
Ron Anderson
d69d628450 Issue #1608 Fixed group deletes in H5pyDataStore.py
Change-Id: I9cd6e186646f9db40b0e498740fb4c63bc99b79a

Former-commit-id: dc7c9edb87 [formerly a2a89fb4e7] [formerly 7c0a5d74bf [formerly dc9ac54903107224633b4e18d5caa345649d8266]]
Former-commit-id: 7c0a5d74bf
Former-commit-id: e952a4f179
2013-02-15 09:03:41 -06:00
Steve Harris
7d0109a349 13.1.2-8 baseline
Former-commit-id: b864fdc303 [formerly e6217a17de] [formerly 06b8eb8db0 [formerly c8797ef99646b2e093ad60cb9a6ee9643405a13f]]
Former-commit-id: 06b8eb8db0
Former-commit-id: 3caf592e83
2013-01-11 16:19:07 -05:00
Steve Harris
f1256f2a9e 13.1.2-7 baseline
Former-commit-id: a8d90da9c0 [formerly 4f86b07eb0] [formerly 42189b5f88 [formerly 0c4514d3be8e7dee89a2abe903b51155a2895fd4]]
Former-commit-id: 42189b5f88
Former-commit-id: b7f1dbe72b
2013-01-11 16:12:09 -05:00
Steve Harris
cd4185ef5c 13.1.2-2 baseline
Former-commit-id: 51208e5515 [formerly c0c1d56f3a] [formerly 4ba416aeb3 [formerly 221d0aaf0e19a054387134e72a76a278159bf4d0]]
Former-commit-id: 4ba416aeb3
Former-commit-id: 941337c553
2013-01-06 14:32:24 -06:00
Steven Harris
f5e63d5f93 12.11.1-1 baseline
Former-commit-id: 0e86bfd1d3 [formerly 618aa3f316] [formerly feec28f274 [formerly 765055b5332ddace3cec2d07e279652de869cfe4]]
Former-commit-id: feec28f274
Former-commit-id: 8843ffd022
2012-09-27 15:57:45 -05:00
Steve Harris
e720b8ed31 12.10.1-1 baseline
Former-commit-id: 0abf64b77c [formerly 195158c004] [formerly d708932029 [formerly 7d17407c5b0a4a3f9b4b083891a5a5975c645810]]
Former-commit-id: d708932029
Former-commit-id: 7bd9c63dc7
2012-09-04 12:07:27 -05:00
Steve Harris
7fb0b17bd5 12.9.1-5 baseline
Former-commit-id: a1d931fd44 [formerly 61f269f54c] [formerly f2fac39428 [formerly d85b989f77196d20eb2d2a21cf4daa13d50474ae]]
Former-commit-id: f2fac39428
Former-commit-id: 72824561cb
2012-08-21 15:27:03 -05:00