Commit graph

8 commits

Author SHA1 Message Date
Mike Duff
986607e3c3 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: 0f7e76ca43 [formerly 3797ca9523] [formerly 77e2d04073] [formerly 0f7e76ca43 [formerly 3797ca9523] [formerly 77e2d04073] [formerly 158b0f8564 [formerly 77e2d04073 [formerly 43a3349eda74743ccbccbef2e04bf80a54beba24]]]]
Former-commit-id: 158b0f8564
Former-commit-id: f991d691dd [formerly edeb23f8d9] [formerly d46b73738f4a15ee173ba2660c33b433eaf7284e [formerly 7228b3cf71]]
Former-commit-id: 326822da770b16c6ea1753b3cb6689ea2bcdae31 [formerly 5a89b10d4b]
Former-commit-id: 46e8c07f1a
2013-08-21 13:46:55 -05:00
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
Bryan Kowal
a800e56338 Issue #1864 - datadelivery and kml are now dependent on the core viz feature.
Former-commit-id: c5afa1883b [formerly 70c8ed6bc0] [formerly 3fac666de5] [formerly c5afa1883b [formerly 70c8ed6bc0] [formerly 3fac666de5] [formerly 64c54f2110 [formerly 3fac666de5 [formerly c5b6f20402cfa47cbc421596b81139f24db2c552]]]]
Former-commit-id: 64c54f2110
Former-commit-id: b4e684ad08 [formerly 6a66158097] [formerly 7caf86fef7ce3f92cf05af51e41bb90a5b3fbdaa [formerly 49ee55327d]]
Former-commit-id: 6265c9153ffe44beeb85c5aaa0594d99ddd97281 [formerly dda6a904ed]
Former-commit-id: cc94b29199
2013-04-04 12:48:59 -05:00
Max Schenkelberg
805eacaa9a Issue #1638 Create base edex and common features that can be deployed to startup a base edex instance
Change-Id: I3f336969a48764785ac148c9d67799e228e66d62

Former-commit-id: 0fb8bb14d2 [formerly 1769edc026] [formerly ec40d261e5] [formerly 0fb8bb14d2 [formerly 1769edc026] [formerly ec40d261e5] [formerly 547c593dec [formerly ec40d261e5 [formerly 108a140d0b203680ed00e9c81b9271a5873ce8df]]]]
Former-commit-id: 547c593dec
Former-commit-id: b6a0a31731 [formerly fc58e7431a] [formerly 5b67b8fa2777f5d1c1e3d2378514221879eea2b9 [formerly 13a4056335]]
Former-commit-id: 984eb0a6ab87ef54eab69d0af6ddebb0e5af12f0 [formerly 0c8f3d2449]
Former-commit-id: 3dcfc90510
2013-02-27 16:19:58 -06:00
Steve Harris
fac2d20002 13.3.1-1 baseline
Former-commit-id: e0406d3183 [formerly 8ae397085e] [formerly 71e8990021] [formerly e0406d3183 [formerly 8ae397085e] [formerly 71e8990021] [formerly d2a654625f [formerly 71e8990021 [formerly 34684c71436ce4c395ea523eb34ded6792476816]]]]
Former-commit-id: d2a654625f
Former-commit-id: db712e1fcf [formerly e4435815c9] [formerly 42269f8019656ea35c9d11244f51d5ae9ac18ac0 [formerly 46d28be4a4]]
Former-commit-id: 30806b31de967d82824f245a2f6cb89f081cfd19 [formerly b3b56830b0]
Former-commit-id: 8c828dbd75
2013-02-20 16:19:40 -06:00
Steve Harris
b43935a991 13.2.1-6 baseline
Former-commit-id: 52f48669f6 [formerly d66ad2f77b] [formerly d0752de66c] [formerly 52f48669f6 [formerly d66ad2f77b] [formerly d0752de66c] [formerly a46e33f06e [formerly d0752de66c [formerly 75e7c2a9423a7caa7f97143fa871be6d0ffe34bb]]]]
Former-commit-id: a46e33f06e
Former-commit-id: 5027d2365b [formerly bbe92e6824] [formerly 133f9034fb8163fb8efb8d8bbd27d7ed610a6e0d [formerly 30d38334cc]]
Former-commit-id: 0cd3f4b5889bda9de32b546358edf3d8210d3ad8 [formerly 0c128dd8f0]
Former-commit-id: dc55ef579a
2013-02-07 16:00:39 -06:00
Steve Harris
b92dfd1b62 13.2.1-2 baseline
Former-commit-id: a4fa438a41 [formerly 33bc5fd816] [formerly 83e9157df7] [formerly a4fa438a41 [formerly 33bc5fd816] [formerly 83e9157df7] [formerly 328c6dccad [formerly 83e9157df7 [formerly bd9eec1d4e6fd843c7bb594b8adb882d72edc6cf]]]]
Former-commit-id: 328c6dccad
Former-commit-id: ce726fadc7 [formerly d9be4dce21] [formerly f30d6bb5c391ebffda9767fba913019b2cd7d050 [formerly 47cc08ac79]]
Former-commit-id: 281ab815ed143a9ff49cedae7054da06195e3c69 [formerly 547c1dedd1]
Former-commit-id: 2779f5c6d9
2013-01-23 11:18:44 -05:00