Commit graph

8 commits

Author SHA1 Message Date
Mike Duff
5b73f4f572 Issue #1848 - Don't show create shared subscription denied message on create sub when user doesn't have the create shared sub permission
Fix for cave startup

Change-Id: Ic5040a0bf89273669cc450370c4d858072df0dd8

Former-commit-id: b42d0e9b4d [formerly 0f7e76ca43] [formerly 3797ca9523] [formerly 3797ca9523 [formerly 77e2d04073]] [formerly b42d0e9b4d [formerly 0f7e76ca43] [formerly 3797ca9523] [formerly 3797ca9523 [formerly 77e2d04073]] [formerly 158b0f8564 [formerly 3797ca9523 [formerly 77e2d04073] [formerly 158b0f8564 [formerly 43a3349eda74743ccbccbef2e04bf80a54beba24]]]]]
Former-commit-id: 158b0f8564
Former-commit-id: 27c8385252 [formerly f991d691dd] [formerly edeb23f8d9] [formerly d030ea2f2f7d47b609c4fdce3cb6bb5add6eeed4 [formerly d46b73738f4a15ee173ba2660c33b433eaf7284e] [formerly edeb23f8d9 [formerly 7228b3cf71]]]
Former-commit-id: c37ce3b292bef77d9a26f6e4b0a159e4cd682cf7 [formerly 326822da770b16c6ea1753b3cb6689ea2bcdae31] [formerly 46e8c07f1a [formerly 5a89b10d4b]]
Former-commit-id: 46e8c07f1a
Former-commit-id: 986607e3c3
2013-08-21 13:46:55 -05:00
Richard Peter
ab7d2f1078 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: d199640293 [formerly d37ba352e2] [formerly 648a1b25ae] [formerly 648a1b25ae [formerly a33ddbd1a6]] [formerly d199640293 [formerly d37ba352e2] [formerly 648a1b25ae] [formerly 648a1b25ae [formerly a33ddbd1a6]] [formerly a9869f07ba [formerly 648a1b25ae [formerly a33ddbd1a6] [formerly a9869f07ba [formerly d8543a8dc09565c12c3aebc21466ed43108a9c85]]]]]
Former-commit-id: a9869f07ba
Former-commit-id: 444cb098d8 [formerly f186912fe1] [formerly aff520d61b] [formerly 0cf1e872288ab5de5bdf00e873e4230ec072d9c7 [formerly fc1253a3eff64276ef10f0a5d0b23f403a4cff70] [formerly aff520d61b [formerly c47eb36e43]]]
Former-commit-id: 7fc92f2e6121db1e3468ea11c8e5fc043eea47f3 [formerly 597cb507dad744955c6d4c7e9004386c40c57fbc] [formerly fb910196c0 [formerly 969fa704e5]]
Former-commit-id: fb910196c0
Former-commit-id: 4a410e92b9
2013-05-17 10:33:18 -05:00
Nate Jensen
a982bac241 Issue #2007 unpack plugins that have res/spring files
Change-Id: Ibc8720a873ae8ba11e89d5d88c668418a3abfc9b

Former-commit-id: 646346c801 [formerly a0b1b9053a] [formerly 86d3bf5a7c] [formerly 86d3bf5a7c [formerly 948e47a2c6]] [formerly 646346c801 [formerly a0b1b9053a] [formerly 86d3bf5a7c] [formerly 86d3bf5a7c [formerly 948e47a2c6]] [formerly fecadf104b [formerly 86d3bf5a7c [formerly 948e47a2c6] [formerly fecadf104b [formerly 147787a0a161bd54926e9ec86aee472b414859ed]]]]]
Former-commit-id: fecadf104b
Former-commit-id: 2b09a16a98 [formerly 4b07083989] [formerly 9284c27ddd] [formerly ce26fe1fe26b31b670c4433ee4188fba965d00de [formerly 45cf8bb5f9314dc1648e43987c8690bb4bf5a8d8] [formerly 9284c27ddd [formerly ba3bda461c]]]
Former-commit-id: ebbb8b6c87790c3ccd5784e1e6e20d4ea00109bd [formerly f836946e3fef029e11cd62cfcf8a2d315d6b7042] [formerly 351989c61f [formerly 43369f0cf3]]
Former-commit-id: 351989c61f
Former-commit-id: df8ba5e468
2013-05-15 13:36:09 -05:00
Bryan Kowal
b7d57ed188 Issue #1864 - datadelivery and kml are now dependent on the core viz feature.
Former-commit-id: b63c14f02a [formerly c5afa1883b] [formerly 70c8ed6bc0] [formerly 70c8ed6bc0 [formerly 3fac666de5]] [formerly b63c14f02a [formerly c5afa1883b] [formerly 70c8ed6bc0] [formerly 70c8ed6bc0 [formerly 3fac666de5]] [formerly 64c54f2110 [formerly 70c8ed6bc0 [formerly 3fac666de5] [formerly 64c54f2110 [formerly c5b6f20402cfa47cbc421596b81139f24db2c552]]]]]
Former-commit-id: 64c54f2110
Former-commit-id: a6339cf95f [formerly b4e684ad08] [formerly 6a66158097] [formerly 3cfa530774fc61fd134e0b67f9044925d0f35b4f [formerly 7caf86fef7ce3f92cf05af51e41bb90a5b3fbdaa] [formerly 6a66158097 [formerly 49ee55327d]]]
Former-commit-id: d00845a00e0d48db2cad899720db5c2bdb5df00d [formerly 6265c9153ffe44beeb85c5aaa0594d99ddd97281] [formerly cc94b29199 [formerly dda6a904ed]]
Former-commit-id: cc94b29199
Former-commit-id: a800e56338
2013-04-04 12:48:59 -05:00
Max Schenkelberg
bcee002b37 Issue #1638 Create base edex and common features that can be deployed to startup a base edex instance
Change-Id: I3f336969a48764785ac148c9d67799e228e66d62

Former-commit-id: f71c49b37b [formerly 0fb8bb14d2] [formerly 1769edc026] [formerly 1769edc026 [formerly ec40d261e5]] [formerly f71c49b37b [formerly 0fb8bb14d2] [formerly 1769edc026] [formerly 1769edc026 [formerly ec40d261e5]] [formerly 547c593dec [formerly 1769edc026 [formerly ec40d261e5] [formerly 547c593dec [formerly 108a140d0b203680ed00e9c81b9271a5873ce8df]]]]]
Former-commit-id: 547c593dec
Former-commit-id: 11af7adae3 [formerly b6a0a31731] [formerly fc58e7431a] [formerly a4ddde18ac76054fba1efad79ea017f97f8039a8 [formerly 5b67b8fa2777f5d1c1e3d2378514221879eea2b9] [formerly fc58e7431a [formerly 13a4056335]]]
Former-commit-id: 5c03857dff4891b06793ec56ae4ebbef5e959910 [formerly 984eb0a6ab87ef54eab69d0af6ddebb0e5af12f0] [formerly 3dcfc90510 [formerly 0c8f3d2449]]
Former-commit-id: 7ccc9d0adf55beec033bad41976a267a83542482 [formerly 3dcfc90510]
Former-commit-id: 805eacaa9a
2013-02-27 16:19:58 -06:00
Steve Harris
915a15006f 13.3.1-1 baseline
Former-commit-id: 6ffa036f05 [formerly e0406d3183] [formerly 8ae397085e] [formerly 8ae397085e [formerly 71e8990021]] [formerly 6ffa036f05 [formerly e0406d3183] [formerly 8ae397085e] [formerly 8ae397085e [formerly 71e8990021]] [formerly d2a654625f [formerly 8ae397085e [formerly 71e8990021] [formerly d2a654625f [formerly 34684c71436ce4c395ea523eb34ded6792476816]]]]]
Former-commit-id: d2a654625f
Former-commit-id: ea9303b160 [formerly db712e1fcf] [formerly e4435815c9] [formerly c996cf8cb561399a370ef3580c705465d6fa20ac [formerly 42269f8019656ea35c9d11244f51d5ae9ac18ac0] [formerly e4435815c9 [formerly 46d28be4a4]]]
Former-commit-id: 4e2c476e2dfb865dde40c9f94f4d16824ed729f6 [formerly 30806b31de967d82824f245a2f6cb89f081cfd19] [formerly 8c828dbd75 [formerly b3b56830b0]]
Former-commit-id: 35d8262ef1ba032fcf5d8ea707ad15ee533bd1a9 [formerly 8c828dbd75]
Former-commit-id: fac2d20002
2013-02-20 16:19:40 -06:00
Steve Harris
3c85f63935 13.2.1-6 baseline
Former-commit-id: f645d7220c [formerly 52f48669f6] [formerly d66ad2f77b] [formerly d66ad2f77b [formerly d0752de66c]] [formerly f645d7220c [formerly 52f48669f6] [formerly d66ad2f77b] [formerly d66ad2f77b [formerly d0752de66c]] [formerly a46e33f06e [formerly d66ad2f77b [formerly d0752de66c] [formerly a46e33f06e [formerly 75e7c2a9423a7caa7f97143fa871be6d0ffe34bb]]]]]
Former-commit-id: a46e33f06e
Former-commit-id: 6b128749f2 [formerly 5027d2365b] [formerly bbe92e6824] [formerly f3506870f6207481b364a8cfac79c7de4d08f83e [formerly 133f9034fb8163fb8efb8d8bbd27d7ed610a6e0d] [formerly bbe92e6824 [formerly 30d38334cc]]]
Former-commit-id: 99ffc46efa72b085e555d1c7d241e0316fa33b30 [formerly 0cd3f4b5889bda9de32b546358edf3d8210d3ad8] [formerly dc55ef579a [formerly 0c128dd8f0]]
Former-commit-id: dc55ef579a
Former-commit-id: b43935a991
2013-02-07 16:00:39 -06:00
Steve Harris
ccbd8dde52 13.2.1-2 baseline
Former-commit-id: 79c717ca60 [formerly a4fa438a41] [formerly 33bc5fd816] [formerly 33bc5fd816 [formerly 83e9157df7]] [formerly 79c717ca60 [formerly a4fa438a41] [formerly 33bc5fd816] [formerly 33bc5fd816 [formerly 83e9157df7]] [formerly 328c6dccad [formerly 33bc5fd816 [formerly 83e9157df7] [formerly 328c6dccad [formerly bd9eec1d4e6fd843c7bb594b8adb882d72edc6cf]]]]]
Former-commit-id: 328c6dccad
Former-commit-id: 19f4c6b47d [formerly ce726fadc7] [formerly d9be4dce21] [formerly 2627373644ec7ef09825bbc0c168afd0abd1a3fe [formerly f30d6bb5c391ebffda9767fba913019b2cd7d050] [formerly d9be4dce21 [formerly 47cc08ac79]]]
Former-commit-id: dc8171a7281c254994a85334494b23b7e0b2a8db [formerly 281ab815ed143a9ff49cedae7054da06195e3c69] [formerly 2779f5c6d9 [formerly 547c1dedd1]]
Former-commit-id: 2779f5c6d9
Former-commit-id: b92dfd1b62
2013-01-23 11:18:44 -05:00