Commit graph

8 commits

Author SHA1 Message Date
Nate Jensen
ef596144a0 Omaha #4473 update references to moved logback classes
Change-Id: I68ac77c7f6f74dacac0d70a6155a93cf37a1873a

Former-commit-id: 339bea8a304cec0afad5b363709689e55fe744c5
2015-06-09 10:41:23 -05:00
Steve Harris
9b3d8a8443 Merge tag 'OB_15.1.1-12' into omaha_16.1.1
15.1.1-12

 Conflicts:
	build/deploy.edex.awips2/esb/bin/setup.env
	cave/com.raytheon.uf.viz.useradmin/src/com/raytheon/uf/viz/useradmin/ui/UserAdminSelectDlg.java
	cave/com.raytheon.viz.gfe/localization/gfe/userPython/textUtilities/headline/FormatterRunner.py
	cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gis/PolygonUtil.java
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/config/gfe/serverConfig.py
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/smartinit/Init.py


Former-commit-id: 881df1ae809fb94151c7bddc8eeda305ac4317f7
2015-05-20 11:25:45 -05:00
Ben Steffensmeier
6c2d341080 Omaha #4284 Create better id for obs/lightning menu.
Former-commit-id: 31893413de438660784ee82274e23f361abb0c1c
2015-05-07 10:53:46 -05:00
Shawn.Hooper
48e06c41ad ASM #17024 - Merge tag 'OB_14.4.1-33' into MERGE-14.4.1-33
Merge 14.4.1-33 into 15.1.1-8

Change-Id: Iaebe94615f952be4b294aea0bcba04117b903e9c

Former-commit-id: 1f63e395c67afa5106bde7b96b72d4b3111221d3
2015-05-01 16:12:48 -04:00
Jason Burks
3d3f3a6535 VLab Issue #6926 - Moved LMA Menus to be in the lightning Menu; fixes #6926
Updated the based on feddback from Ben.

Change-Id: I2c400f98dc80ee2583818da26466fa9eac37f281

Former-commit-id: 56d2ffeaf8564c8ea02f52ef35e8aebea2e9f992
2015-03-14 14:36:37 +00:00
Jason Burks
c71994ea71 VLab Issue #6554 Removed dependency on org.apache.commons.logging; fixes #6554
Change-Id: I9e11f605069ee8dab0c8efa0c77fe4702d95d18a

Former-commit-id: ec6e24420ad62fc306c577a0ec9e19c72d0d2bbe
2015-02-20 23:31:11 +00:00
Jason Burks
9b0f630436 VLab Issue #6412 - Fixed the problem with ParameterLookup not being registered. As per Nate Jensen recommendation updated the spring configuration to depepnd-on getParameterHandlerRegistered.
Also based on his recommendation removed parts from constructor and added them to the decode method that get singleton references for paramlookup and variable dictionary lookup. fixes #6412

Change-Id: Ie3554842b9f029dd62ff73f5edc928bc03e012e4

Former-commit-id: 2ca313195e2e610d4a198884f45dde37ebecfbc6
2015-02-11 20:06:54 +00:00
Jason Burks
325f31f6ef VLab Issue #5240 - Baseline LMA; fixes #5240
Made changes suggested by Ben S.
Made other changes suggested by Ben S.
Made changes suggested by Richard Peter.
Made change from Ben S.
Change-Id: Ic7eb146c30d8024b34782187318e79882fc963bd

Former-commit-id: a941dd68c3c5b42671ad78900d6d8f8231d70810
2014-12-08 21:01:19 +00:00