Commit graph

5 commits

Author SHA1 Message Date
Richard Peter
4a410e92b9 Merge branch 'omaha_13.4.1' (13.4.1-9) into development
Conflicts:
	cave/com.raytheon.uf.viz.common.core.feature/feature.xml
	cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/util/CurrentWarnings.java
	edexOsgi/com.raytheon.uf.common.dataplugin.warning/src/com/raytheon/uf/common/dataplugin/warning/PracticeWarningRecord.java
	edexOsgi/com.raytheon.uf.common.dataplugin.warning/src/com/raytheon/uf/common/dataplugin/warning/WarningRecord.java
	rpms/awips2.qpid/0.18/SPECS/qpid-java.spec.patch0
	rpms/legal/FOSS_licenses/werkzeug/LICENSE.txt

Change-Id: Icc296cedd6d190d1743727c228e540036f9b6d8c

Former-commit-id: d37ba352e2 [formerly 648a1b25ae] [formerly a33ddbd1a6] [formerly d37ba352e2 [formerly 648a1b25ae] [formerly a33ddbd1a6] [formerly a9869f07ba [formerly a33ddbd1a6 [formerly d8543a8dc09565c12c3aebc21466ed43108a9c85]]]]
Former-commit-id: a9869f07ba
Former-commit-id: f186912fe1 [formerly aff520d61b] [formerly fc1253a3eff64276ef10f0a5d0b23f403a4cff70 [formerly c47eb36e43]]
Former-commit-id: 597cb507dad744955c6d4c7e9004386c40c57fbc [formerly 969fa704e5]
Former-commit-id: fb910196c0
2013-05-17 10:33:18 -05:00
Nate Jensen
df8ba5e468 Issue #2007 unpack plugins that have res/spring files
Change-Id: Ibc8720a873ae8ba11e89d5d88c668418a3abfc9b

Former-commit-id: a0b1b9053a [formerly 86d3bf5a7c] [formerly 948e47a2c6] [formerly a0b1b9053a [formerly 86d3bf5a7c] [formerly 948e47a2c6] [formerly fecadf104b [formerly 948e47a2c6 [formerly 147787a0a161bd54926e9ec86aee472b414859ed]]]]
Former-commit-id: fecadf104b
Former-commit-id: 4b07083989 [formerly 9284c27ddd] [formerly 45cf8bb5f9314dc1648e43987c8690bb4bf5a8d8 [formerly ba3bda461c]]
Former-commit-id: f836946e3fef029e11cd62cfcf8a2d315d6b7042 [formerly 43369f0cf3]
Former-commit-id: 351989c61f
2013-05-15 13:36:09 -05:00
Max Schenkelberg
10ee43ad97 Issue #1638 Added viz base feature as well as personalities cave project extracting out non-awips specific things in personalities awips project
Amend: Removed eclipse feature all together, added os and arch to fragments.  Ensured unpack flag stayed same when changing features.

Change-Id: I78a2c5262ebdbe3ace3c180254b5f036011c0a65

Former-commit-id: 16cce70f9d [formerly 6ccef4d3c7] [formerly bd52681be3] [formerly 16cce70f9d [formerly 6ccef4d3c7] [formerly bd52681be3] [formerly 7513e5982b [formerly bd52681be3 [formerly dd4ddb8aacf82f7c69860b470c3f754a59f0c124]]]]
Former-commit-id: 7513e5982b
Former-commit-id: d0edd6a882 [formerly 1950aff01a] [formerly 0dd1d5c1eb848344c287d03fc5cb6b4556d376ab [formerly 57f34e9080]]
Former-commit-id: d0f63d287352e6fa8f52b87780f423ef41d87efa [formerly 2e5c1a7c32]
Former-commit-id: eb6a0d25d0
2013-04-17 11:42:46 -05:00
Steve Harris
5b35d8a6e0 12.4.1-4 baseline
Former-commit-id: 4767b0e069 [formerly 750b7543dd] [formerly 67a5a68300] [formerly 4767b0e069 [formerly 750b7543dd] [formerly 67a5a68300] [formerly 2a216f333c [formerly 67a5a68300 [formerly ad648deaf4d3edaabdda15184289b3a927308bd7]]]]
Former-commit-id: 2a216f333c
Former-commit-id: 98d8b3f188 [formerly a2a6a18fae] [formerly e8514db31c64b82122112f0e87cbbf3cda2d8c2b [formerly a4e519f3cd]]
Former-commit-id: 816045b74a6ddb3791f4e241a6f25a4d4ab3391a [formerly 8cd5974f4c]
Former-commit-id: 74b66d9683
2012-04-18 15:18:16 -05:00
root
7dbd17a5aa Initial revision of AWIPS2 11.9.0-7p5
Former-commit-id: 133dc97f67 [formerly a02aeb236c] [formerly 9f19e3f712] [formerly 133dc97f67 [formerly a02aeb236c] [formerly 9f19e3f712] [formerly 06a8b51d6d [formerly 9f19e3f712 [formerly 64fa9254b946eae7e61bbc3f513b7c3696c4f54f]]]]
Former-commit-id: 06a8b51d6d
Former-commit-id: 9bb8decbcf [formerly 8e80217e59] [formerly 377dcd10b9 [formerly 3360eb6c5f]]
Former-commit-id: 377dcd10b9
Former-commit-id: e2ecdcfe33
2012-01-06 08:55:05 -06:00