labofsahil/github-event-dataset-2012 huggingface dataset:
Bug CS-15020: DB inconsistencies after upgrade from Acton to Bonita

Description:

	Putting in table creation DMLs in upgrade script
	when upgrading from Acton (3.0.2) to Bonita (3.0.3).
	Please note that the field names in the tables need
	to be changed as per naming conventions. Those changes
	will be checked in in an upcoming commit.

Conflicts:

	setup/db/db/schema-302to303.sql
CS-9919: Support for Nexus Swiches (Cisco Vswitches)

Description:

	Removing two unexposed APIs that we never use:
		ConfigureCiscoNexusVSMCmd
		ListCiscoNexusVSMCmd

	More changes to follow.
CS-9919: Support for Nexus Swiches (Cisco Vswitches)

Description:

	Putting in code changes as per Alena's reviews:

	  Replaced references to CiscoNexusVSMDeviceVO
	  in GetCiscoVSMByClusterIdCmd to work with an
	  interface that CiscoNexusVSMDeviceVO instead,
	  since VO objects should not be directly accessed
	  in APIs.

	  Made associated changes in other files.

	More commits incorporating Alena's review comments
	will follow.
CS-9919: Support for Nexus Swiches (Cisco Vswitches)

Description:

	More changes incorporating Alena's review comments:

	  1. Changed id to clusterId for better naming.

	  2. Changed the name of GetCiscoVSMByClusterIdCmd
	     to ListCiscoVSMDetailsCmd.

	  3. Removed the GetCiscoVSMDetailsCmd command.

	  4. Removed catch{} blocks in each of the Nexus
	     related APIs since the exceptions raised in
	     the API implementations will be caught in the
   	     command dispatcher.

	  5. Added ActionEvent annotation to
	     deleteCiscoNexusVSM() function.

	  6. Modified each Nexus API command's
	     getEntityOwnerId() to return
	     Account.ACCOUNT_ID_SYSTEM.
CS-15024: NullPointerException thrown while executing GetVmStatsCommand

Description:

	Fixing incorrect non-null object check.
CS-9919: Adding helper routines to query details of a port profile and
associated policy maps. Also updating the error message logs.
CS-9919: Support for Nexus Swiches (Cisco Vswitches)

Description:

	Incorporating more changes post review by Alena.

	1. Renamed the ListCiscoVSMDetailsCmd command
	   to ListCiscoNexusVSMsCmd. The command will
	   return a list of VSMs always, depending on
	   what parameter is passed to it. If a clusterId
	   is passed to it, it will return the VSM
	   associated to that cluster, if present. If
	   a zoneId is passed in, it will return a list
	   of all VSMs configured for any clusters of
	   type VMware within that zone. If neither is
	   passed, it will return a list of all VSMs
	   configured in the management server. If no
	   VSMs are found, it will return an exception
	   response.

	2. Cleaned up miscellaneous code.

Conflicts:

	client/tomcatconf/cisconexusvsm_commands.properties.in
	server/src/com/cloud/server/ManagementServerImpl.java
bug CS-14814: Do not allow attaching volume to a stopped vm for an uploaded volume. Make changes to accomodate volume attaching for a vm created in Stopped state.
Merge Autoscaler UI implemetation

This change includes the new dialog box for the CloudStack Autoscaler
implementation. It is accessible by a button ('Autoscaler') that
appears under each LB rule.

This also contains changes to the multiEdit widget to support features
required for Autoscaler:

-Fixes context/data passing to custom button widgets
-Fixes data retrieval for select fields
Clean up indentation/whitespace for autoscaler UI code
S2S VPN: Remove obelete guest_ip from updateCustomerGateway
Move ACL multiEdit to cloudStack.vpc.acl, to fix JS errors due to missing action
Add base upload volume action
CS-16111 - DB upgrade; fixed foreign keys names
Reviewed-by: Frank Zhang
Low: BasicSanity - fail if any subtest failed
Low: Doc: TODO list update
Medium: fencing: Detect if we can support legacy Linux-HA fencing agents at runtime using dlopen()
Low: Build: Clean up some legacy baggage
Low: Build: Move private function declarations to an internal header
Low: Build: Remove unneeded replace functions
Low: Build: Mark private functions as internal
makeing sure the deps are good and also work with leiningen 2
should still work with lein1 though
Merge pull request #2 from AtKaaZ/master

just making sure it compiles/run currently, with lein2
adding files that were somehow deleted on last push.
adding files that were deleted somehow.
Save modified Gemfile and static_pg contrlr.
Added basic content and layouts
Änderung während Vorstellung
Bump version code as well...
action links on favourite
Added update method to Logic interface
added updatable logic and constructors for event model/logic/views to work with update and new events
small bugfix in constructor usage
Clean up constructor chaos of me, try to decide upon null Event, if new or existing event is used in the view (delaying the decision as long as possible)
Merge branch 'master' into dave_Working-on-UI
added forcetest target for ant to build.xml
Created Systemidee and updated some indices
some cpu and board stuff
fixed the formatting of the help section for contacting support.  it was misaligned
Add noknife support with DaMacc/zxz0O0's library
first commit. attempting to smooth out mouse movements
Merge branch 'master' of github.com:DerManoMann/ZenMagick
drop 'apps.store.admin.defaultEditor' as that won't make any difference anyway
add meta data
set some default bundles
Merge branch 'master' of github.com:DerManoMann/ZenMagick
added getType()
criacao de alguns modelos
Working on making the interface more dynamic
It was compile!
Did a lot of changes and they all suck bad. So. good luck.
seo friendly urls for forums
start on field validation
adding summer flounder utfgrid and adding commas to utfgrid numerical output
recovery from failed mvn release:prepare
[maven-release-plugin] prepare release ecwid-mailchimp-1.1
ONLY_RAW removes POSIX dependency
Transparency fix
Refactor to allow for server build.

Ugh. :|
first ivy/ant deployed
Orders dispatching tests
MarketCommand
hook up the lib to sinatra
modif main
Merge branch 'master' of github.com:Firefly74940/Labo-Web

Conflicts:
	iaproject/test/__init__.pyc
	iaproject/test/ia.pyc
Add board to route plugin
Ajout de tous les noms
FS-4299 --resolve regression from 23f8967c the code was not making sure both endpoints were type 'sofia' and dereferencing dingaling channel into sofia and causing memory corruption
Add a .version file to nightly tarballs
FS-4353 --resolve this may also fix FS-4079
Abort module load if config can't be opened. Refs FS-4438
FS-4847 try this
FS-4867
added local copy of webfont api
Basic loading screen
Added Click Handler
Added second game state, and enabled full screen on ios
Tile Size Change
Moved main menu code to a class instead of module. Altered the bootstrap.
Refactoring Jeff's code to function with GFW. Still trying to successfully merge MainMenu.js
add sql for creating highway road
Update FunctionalSpecification/Sections/00Introduction.tex

Minor and for the most part not really useful changes.
Some slight changes to Apps page
Migrating jcompbio.sty from www.maths.lth.se website to GitHub.
Merge branch 'master' of https://github.com/HenrikBengtsson/LaTeX
Fix for not consumed errors in field errors

Added a to_json method in the message iterator.

Signed-off-by: Guillaume Poirier-Morency <guillaumepoiriermorency@gmail.com>
Added Windows Interactivity dll
Revert "Bug fixes, augmented display of themes."

This reverts commit 646afbbb123089ff4ca1d13d4cf68ef4eb0c6ee3.
More files in support of PhotoSwipe
taxi calculations
Updated styles, added sprite file
[TASK] Updated the readme a bit.
Merge pull request #7 from DaiTenshi/master

Updated the README
DesktoView Test update

Signed-off-by: isszul <Isszul@gmail.com>
merge 1208 pull request (#105); fixes #9, #10, #76, #82; adds #8 test; several SVG fixes
remove stupid large file
use new magic-next
Finalized parser

PACMAN-60
Added login and logout macros for TiddlyWeb
Viewing a game now works
Blah Blah Linux Blah
增加仪表3和4

Signed-off-by: AB <www.wpj@163.com>
update gitignore
added temporary readme
removed node_modules from repo
merge dev branch
update analytics category
show welcome message to redirected visitors
readme update
fix scroll position issue on image display page
tweet button
formatting
some clarifications about the reasons behind open sourcing the app
properly handle redirects from pasteshack
add missing .
show clickable image link on upload
more analytics events
updated volume widget
update limits
Merge branch 'master' of github.com:Josh211ua/TinyControl
Gestion de la partie public du blog
Gestion de la partie public du blog
Ajout des paramettre d'installation
Merge pull request #4 from JournalTrader/Blog

Blog
[Scripting] Wrap the class 'ScenesManager' in JavaScript
Automatic commit of package [foreman] minor release [1.0.1-41.fc9ba74].
Testing godoc.
Add more tests and review support of identity change.

DuplicateIdentificationValue detection covers more cases than before, in particular
cases concerning supertypes, and by extension, it covers cases which were previously
taken care of by ImplicitSubtypeChange.

Some refactoring have also been done on InstanceIndex to use Forwardable.
webAvancee
Fixed elog output
Knarik's changes
Hopefully decreasing falldowns
Fixed  issue #06100: English in other language
Dev eliminated mandatory message in group-level preview
Dev fixed issue : Bad HTML for statistics with Ranking with HTML
Dev: replace htmlspecialchars by flattenText : is this good ?
Fixed issue #06213: File upload questions tips have an error in italian
Fix: Fix part 2/2 (data editing) for bug
#6044: Use advanced question settings such as numbers_only,
display_rows, max_characters, prefix, suffix, ... at data entry screen.
Dev: Here comes the original .gitignore file. Sorry for overwriting it
accidentally.
Fixed issue: JavaScript errors in CPDB share panel and attribute control
Fixed issue: Error in update scripts for MSSQL server
Renamed scratchedit.xul to scratchpadOverlay.xul
Added handoff
Switch back to iCloud after resetting it.
Persistence fixes on OS X.

[FIXED]     OS X: Handle recovery from unsupported stores.
[FIXED]     OS X: Use predicate instead of predicate template.
Improve UI to be more HIG friendly.

[IMPROVED]  Use action sheets instead of alerts when showing destructive
            action choices.
[IMPROVED]  Make tappable regions at least 44x44pt.
[IMPROVED]  Title/message for alert/sheets.
Guide pager, fonts, crash.

[ADDED]     Page controller in guide to see where in the guide you are.
[ADDED]     FontReplacer to be able to "use" Exo from IB (by
            substituting "Futura").
[FIXED]     A crash when loading the main VC because of the reset
            password gesture recogniser.
[IMPROVED]  Font in tables to standard system fonts.
[IMPROVED]  Guide content positioning and sizing making space for pager.
Typo:

Increased the distance that requires individual (blue marker) meetings be combined into red markers. This is because close markers don't work well with chubby paws like mine.
Search Activity updated brand does not work yet will
update once php script is updated.
Change CardId to Id to follow naming convention
Fix compilation for Release configuration and source tree with spaces in path
Set build platforms to Any CPU, except for where we load 32-bit libraries.
Solution: Fix platform and project selection for build targets

Also remove DependencyLess solution, as it's too much work to keep it up to date.
TAS: Remove dead code
Be a bit more quiet when MediaPortalDirs.xml could not be found
Forgot to change these back..
favicon.ico
dodat link edit za admina u user/view
internalerror skoro pa zavrsen
a ton of shit
I am truly sorry, git people

Signed-off-by: Reilly Steele <steelereilly@gmail.com>
improve external scripts
configuration for leon hardware floatingpoint
rename+fix firm 1.17 script
fix/improve build scripts for external projects

Support building on amd64 with -m32 now.
Initialize VLA with 0 entries test
ElvUI 3.33-47
Add ItemsInfo module.
fixed merge
generate inittab on firstboot
fix FC bug when pattern unlock fail upto 5 times with next button click

Change-Id: I534473dbd7e8c184aeb56b2797fcdc1cbd9dbf31
fix a bug that can't switch to account unlock screen when pattern unlock fails upto 5 times and toggle the 'forgot pattern' button in bottom-right of screen

Change-Id: If350e52d08d48a6f07196401a34bdd4f99b3a109
remove stock app

Change-Id: I34ac3356c751c88a23ac7e853ebed00d478ef8b3
ignores for Scala
more ignores
initial project setup
basics of Scala
scala range
scala tuples
scala classes
multiple constructors
singleton as scala object
my naïve implementation of evaluating the winning condition of a tic-tac-toe board
playing with tuples, with @cordmata
change
change
Merge branch 'master' of https://github.com/MinskLab2012/Module-7
Merge branch 'master' of https://github.com/MinskLab2012/Module-7
change
Reveal without delay on click
Bump changelog for #386.
Cleaned up input for SSL Host.
Fixed call to private property.
Made plugin always normalize all URL's before fixing anything.
Zeitraum Wählen, Datum Fehler, DatumHelperKlasse

- Datum wird im 12h Format angezeigt anstatt im 24h
-   Standardmässig nur Einträge vom laufenden Monat anzeigen
-  Datum wählen funktioniert noch nicht korrekt -> erscheinen immer alle
Daten
moved excess end of reference tags
actual coca_cola work (re-implementation)

-coca_cola function re-implementation
-make guys counter constants
-myid variable in order struct
-remove semaphore directives (were still in there)
Update pubspec.yaml

- Updated version string to 1.0.1
Remade Main Window
zoom en select events
pull merge conflicts opgelost
common dtos in gitignore
Ensimmäiset tiedostot
Signed-off-by: enohl <e.nohl@arcor.de>
Signed-off-by: enohl <e.nohl@arcor.de>
Signed-off-by: enohl <e.nohl@arcor.de>
Merge pull request #2 from enohl/master

go
Fixing webroot for builtin php server
Adding new defaults for equity index options
[PLAT-2541] Removing uses of EHCacheUtils.createCacheManager() and injecting a shared, configured cache manager instead
Further development of the CDS contract definition
Commit
Further development of the CDS contract definition
Further development of the CDS contract contact definition and some initial work on CDS index swap contract definition
making clipboard more tolerant of data errors
Add links to other map services
now using scr/ to contain classes
Format
Added join-strings function in until
Added mouse over tooltip on stations
MozFR flavour for Tabzilla
Testing Issue #75.
Tags should not be required for stories
Merge branch 'master' into develop
s/Communication Preferences/Notifications and Subscriptions/

Closes #448
Added two-column template
Updated sorting of projects and organizations
Updated last edited field on Projects and Organizations when they are
related to a Story
Display story languages as links to story detail page in that language
Truncate story summaries in explore view to first paragraph.
style cleanup for carousel headers on main page. fixes #257.
some cleanup of project detail page, twocol, twocol cms. project detail page has minimal actual data wired in.
pull from develop + trivial conflict fix. https://github.com/patternleaf/atlas/pull/4
force li elements to enclose their contents (bottom-borders were being printed in stack) in explorer list view.
convert style-new.css to less, broken out into multiple files.
add simple css for forms. fixes #248.
better form styling. also some styling for ul.messages and in-form errors. fixes #248.
add password inputs to style selector.
add sidebar to bulk import in base.less.
move less files into their proper location. (& rename "layout.less" to "template-layout.less" to avoid conflict with existing file)
move variables from base.less to variables.less.
add node script to compile /static/less/*.less to /static/css/compiled.css. probably a temporary situation.
conditionalize running less.js live versus inclusion of static css. also clean up some stale css inclusion.
Merge remote branch 'eric/templatizing' into theme

Conflicts:
	templates/homepage.html
Merge branch 'develop' into theme
pull request from develop branch (https://github.com/patternleaf/atlas/pull/5) + minor conflict fix
move template images from /static/css/images to /static/img. update references in templates and less files.
fix search form input styling.
i18n for static text in homepage, megamenu, story_detail templates.
add little arrow doo-dad below "my account" menu.
We'll try again later...
Removing messenger from menu bar
Ajout du fichier proguard
[-] MO : fixed total quantity in statsforecast #PSCFV-5986
Revert "Merge branch 'master' of github.com:Q42/getusermedia-demo"

This reverts commit 2b9acb2e11bf42c58121edbe303c5f1c19ae4b4d, reversing
changes made to eab207f1ed91eedd646a3bd87b49a923330a834f.
Implemented delete functionality, Checks if name is empty before inserting new user
added first version of pychi
Merge remote-tracking branch 'origin/master'
Revert "Revert "fix for 70803 Item - Rogue T10 4P Bonus (Rank 3)""

This reverts commit b2b3ea9e9fd527e38d49a500166e53197c8b520c.
added channel
0.5.0
Fix environment editing - reflect that priors and names are no longer changeable.
Move test supposedly for search that really tests system groups, to
its own group in systems tests, also add a simple test while i'm at it.
Fix provider locator
Loosened check-for-success function pass requirement to allow information in addition to success notices.
Also disabled check-for-success check on login due to issue with notification retrieval.
Added comment for temporarily disabled check-for-success.
Merge pull request #169 from gstoeckel/notifications

Notifications
[Alex] Started work on "Friends"
Merge branch 'master' of https://github.com/RedPheasant/LoggerApp.git
[Alex] Extended work on "Friends"

1) Completed "Add Friends"
2) Completed "Remove Friends"
3) Half way with "View Friends"
Merge branch 'master' of https://github.com/RedPheasant/LoggerApp.git
use jquery to display always visible buttons
qos fix
added hover highlight
Merge branch 'qos-fix' into EasyTomato-RT
fix issue: #30 save button color
valuta configuratie nu in frontend van adding. Moet nog in jexpricelist en email(!)
Updated to reflect new PupEventsServer feature
Added 'throw event on disconnect' feature
Updated cabal version numbers
Preparing interface and trying out craftyjs
More reclassifying and deleting duplicate resources.
re-work AST
merge
post line deletion
post heiarchy addition
jetzt auf
Se agregaron algunos parametros a la clase neurona tal como enfriamiento
Added board reading and fixed various bugs after testing
Add example blocks
Update the Block engine quite a lot
Start to add an admin section
Adding readme to main branch
Manually merge master
Add enum DialogCancelEvent.DialogCancelType.

Signed-off-by: mk124 <mk124a@gmail.com>
Das Installationsscript prüfte nur auf PHP 5.3, das System an sich dann allerdings auf PHP 5.3.2, so würde z.B. eine Installation funktionieren, der Rest aber nicht wenn man z.B. PHP 5.3.1 laufen hat.
Ajout de la fenetre de nouveau compte
! Improve option for displaying WYSIWYG on Quick Reply
Signed-off-by: Michael Eshom <oldiesmann@oldiesmann.us>
! Technically it's "full editor", not just WYSIWYG

Signed-off-by: Michael Eshom <oldiesmann@oldiesmann.us>
Merge pull request #176 from Oldiesmann/release-2.1

! Improve option for displaying full editor on Quick Reply
Realize a data annotations at a service level

add control of the xbrl entity . in case there is a mismatch with the previous annotation the user is informed that is going to loose the mapping data of the previous annotations.
2 fixes

Issue #68
https://github.com/Slowpoke101/FTBLaunch/issues/68
Issue #70
https://github.com/Slowpoke101/FTBLaunch/issues/70
Fixes multiple user saving/loading

Also adds in additional save for last user setting.
Hopefully formatted code to your likings.

Also added in a check if file exists for the logindata file to prevent
the messy error x.x
Added/Finished Profile Editor Button
Prevent duplicate entries.
Fixes 'frozen' launcher upon failed login.
Start storing ram settings.
Merge pull request #72 from unv-annihilator/master

Fixes a lot of issues, Finishes Edit button code.
Convert Shift-Jis To UTF-8
Fixed building of lv-tool GLX driver using an updated FindX11.cmake
Updated with more notes about how it works and unit tests.
[maven-release-plugin] prepare release benchmarks-2.1
Track chef-client result and re-run, if necessary.
add whitespace

Formatting changes.
Adaptation to the new routing system
Update PLUGINS.rst

Added note about concurrency for supervisor-wildcards plugin
paginas estáticas y dnámicas
Fixes a potential item dupe if code usage changed
Depressant, ingest as prescribed
fix?
fix?
fix?
fix?
Change the order the messages are sent on TPS commands if configured to
show entities and/or chunks, per request.
Fix type in flask_irc/bot.py

ImportErrror should be ImportError. 
Merge pull request #1 from Kyso/patch-1

Fix typo in flask_irc/bot.py
[NBU] agregado controlador de subsistema NewsResources
Login with facebook
Merge branch 'master' of https://github.com/Throy/derp-octo-robot

Conflicts:
	Laboratorio/IndignadoServer/LinqDataContext/IndignadoDB.dbml.layout
	Laboratorio/IndignadoWeb/Web.config
	Laboratorio/Laboratorio.suo
add graph.tex.
add graph.tex file and finish the content.
controllers.flights: order by pilot's display name instead of pilot_id on ajax response
fastcgi.py: replace hard-coded strings by argparse
fastcgi.py: add option --socket

Prepare for running SkyLines as a standalone FastCGI daemon.
fastcgi: runit service scripts

Switch the live server from the leaking lighttpd to nginx, and launch
the two FastCGI scripts as stand-alone daemons.
runit scripts for the tracking daemon
daemon: use the twisted logging library
tracking: remove support for old fix packet

XCSoar 6.4_alpha2 has been out for some time.
tracking: roll back transaction on SQLAlchemyError

Works around broken tracking daemon after a database error has
occurred.
controllers.tracking: show only traces that have a valid location
public/js/g.raphael/g.line: add stripes layer for enl display
public.js.flight: add engine noise level to barogram

Needs FlightPath helper to output the ENL value as fourth column.

The tracking doesn't record ENL yet, but it needs to output some values
due to the shared js library with the flight display, so currently it
just outputs a list of zeros.
publis.js.flight: show ENL text in the barogram
public.js.map: add airspace only baselayer
public/js/g.raphael/g.line: update to allow switching between multipe stripe datasets

see https://github.com/TobiasLohner/g.raphael for all changes
public.js.flight: remove unused settings from linechart initialisation
public.js.flight: set the primary flight in the barogram

For highlighting the primary flight and switching enl values
added raw functions
improve registration process
Cambio nombre empleado por su id para filtrar búsqueda
add some links and fix some indentation
Bugfixing RuoloRepository
Removing $convert parameter
Improving DefaultControllerTest
Repository class names search & replace
Adding Selenium driver to Mink
Updating vendors
Updating Error references
Removing legacy CLI script, old Scripts must be converted to commands
Fixing UserId
Doc and error messages.
Return $this. Some more doc adjustments.
Fix 8-bit support
Fix float type cast issue
Merge branch 'master' into hadoop-os-build
Merge remote-tracking branch 'origin/hadoop-os-build' into hadoop-os-build
Merge remote-tracking branch 'origin/hadoop-os-build' into hadoop-os-build
Merge branch 'master' into hadoop-os-build
Merge branch 'master' into hadoop-os-build
Add a README for the sledgehammer hook infrastructure.
Merge branch 'master' into hadoop-os-build
Add updated submodule references for master
Merge branch 'master' into hadoop-os-build
Merge pull request #918 from VictorLowther/pull-req-master-bc07fb3101

Add -pre and -post hook infrastructure to Sledgehammer. [3/6]
Merge pull request #921 from VictorLowther/pull-req-hadoop-os-build-1a52fc6e09

Add -pre and -post hook infrastructure to Sledgehammer. [6/6]
Merge branch 'master' into hadoop-os-build
Merge remote-tracking branch 'origin/hadoop-os-build' into hadoop-os-build
Merge branch 'master' into hadoop-os-build
Make sure all refs are synced.
Merge branch 'master' into hadoop-os-build
Update refs
Merge pull request #924 from galthaus/pull-req-master-312c4f1bf7

Update refs for all the pulls to be at the same level. [1/4]
Merge pull request #927 from galthaus/pull-req-hadoop-os-build-ed37359afa

Update refs for all the pulls to be at the same level. [4/4]
Merge branch 'master' into hadoop-os-build
Merge branch 'master' into openstack-os-build
Eschew barclamp merge conflicts.
Eschew barclamp merge conflicts.
Move barclamp submodule refs back.
Move barclamp submodule refs back.
Merge remote-tracking branch 'origin/openstack-os-build' into openstack-os-build
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/openstack-os-build' into openstack-os-build
Merge remote-tracking branch 'origin/master'
Merge branch 'master' into openstack-os-build
Sync all trees
Merge branch 'release/rails3anddb/master' into release/rails3anddb/openstack-os-build
Sync all builds
Add some initial rails3 pieces and move assets
Merge branch 'release/rails3anddb/master' into release/rails3anddb/openstack-os-build
Merge pull request #1078 from galthaus/pull-req-release-rails3anddb-master-24dbbbf748

rails3 initial hacks [3/6]
Merge pull request #1080 from galthaus/pull-req-release-rails3anddb-openstack-os-build-f18f7e02bd

rails3 initial hacks [5/6]
Merge branch 'release/rails3anddb/master' into release/rails3anddb/openstack-os-build
Add more rails3 changes.
Merge branch 'release/rails3anddb/master' into release/rails3anddb/openstack-os-build
xfail crate-method-reexport-grrrrrrr.rs, which has been burning the build for days
Do vtable resolution for *all* method calls, not just statically resolved ones... Closes #3221.
add syntax highlighting file for kate editor
Add PosixPath to path2. Add path2 to core build. Add dot/dotdot-normalizing.
Re-allow pattern-matching structs (#3215)
remove fixme in check::alt
Disallow deconstructing destructing structs (fixes #3147)
core: adding option::or, a function to return the leftmost of two some() values or none if both are none
Merge pull request #3236 from dbp/or

core: adding option::or(a,b) that returns the leftmost some() or none otherwise
register new snapshots
implement arc::unwrap and add exclusive_unwrap tests
Add unwrap for std::arc ARC variants
oops, remove #[cfg(stage1)]s from arc::unwrap functions+tests
Try to do some resolution of vtables earlier, in a fairly ad-hoc way. Closes #3156.
Document arc::unwrap. Close #3123.
new region inference, seperate infer into modules, improve error msgs

Fixes #2806
Fixes #3197
Fixes #3138
Merge branch 'incoming' of git://github.com/mozilla/rust
fix kate syntax highlighting file
correções rápidas
Add support for 2.0.3 in style transformer
Release 0.8.1
fixed HttpPHPUnit/Main/TemplateFactory
GitHub: add repository from URL
GitHub: add getMainMetadata & getMetadata to repository
Repository importer
setup fix
Fix setup
change email configuration
Forgot some keys in the tutorial
Генерация RTF
Merge branch 'master' of github.com:WikiSocium/WikiSocium
Message
finisched 5.5
Updated comments...

All three versions (12-bit, 15-bit and 20-bit) of the SONY SIRC protocol
should work.
added calculation for flat armor pen and it seems to work!
fixed typo in items.

Also, next is the event list. I'm thinking it sets up the whole fight which takes care of duration of effects. It'll just recalculate each tick which should be ok. I'll probably keep it to full ticks, not half. Anyway, there'll be a top level funct called flush which clears what's in the action stack then applies/sec effects like gold and hpregen. it'll finish when one is dead or the stack is empty.

Also, need to add bit for max hp/mana/energy/rage so hpregen doesn't add to max health (which is what it'd do now).
LU-1604 osd: don't call md_ucred() for OFD

There are several places where md_ucred() is called in osd-ldiskfs.
However, this function is specific to the metadata stack (it ends
up calling a callback in mdd layer) and should not be called with OFD.

osd_{push,pop}_ctxt() have thus been modified to be no-op when the
parent is of DT type. __osd_oi_insert() has also been changed to call
md_ucred() only when dealing with a MDT device.

This hack is required to keep compatibility with current MDT stack,
but should be removed as soon as the LOD/OSP is landed.

Signed-off-by: Johann Lombardi <johann@whamcloud.com>
Change-Id: I931f0376a78cb2aff8b00a99b1c20618d4093e7d
Reviewed-on: http://review.whamcloud.com/3286
Tested-by: Hudson
Tested-by: Maloo <whamcloud.maloo@gmail.com>
Reviewed-by: Alex Zhuravlev <bzzz@whamcloud.com>
Reviewed-by: Li Wei <liwei@whamcloud.com>
Reviewed-by: Mike Pershin <tappro@whamcloud.com>
Reviewed-by: Oleg Drokin <green@whamcloud.com>
LU-1209 tests: get dir size after rename in sanity 133d

Because rename will change the directory size, so we
should get dir size after rename.

Signed-off-by: wang di <di.wang@whamcloud.com>
Change-Id: I1fee9f75cbc0163d10e9de7f04fcf00a4d5c1d9d
Reviewed-on: http://review.whamcloud.com/3298
Reviewed-by: Yu Jian <yujian@whamcloud.com>
Tested-by: Hudson
Tested-by: Maloo <whamcloud.maloo@gmail.com>
Reviewed-by: Andreas Dilger <adilger@whamcloud.com>
LU-1481 build: quiet warnings due to := assignment

When running automake to generate Makefiles, newer compilers will
warn about non-portable assignments:

  lvfs/autoMakefile.am:52: `:='-style assignments are not portable

The use of ":=" vs. "=" determines when conditional expressions
are evaluated, but have absolutely no use for constant assignments,
so there is no point in using them at all in that case.

Convert all ":=" to "=" for constant assignments, leaving the
decision to use ":=" for conditional assignments until later.

Signed-off-by: Andreas Dilger <adilger@whamcloud.com>
Change-Id: I76caedbc1368a0d2fe02137c46b46c36fc3a500c
Reviewed-on: http://review.whamcloud.com/3129
Tested-by: Hudson
Reviewed-by: Brian J. Murrell <brian@whamcloud.com>
Tested-by: Maloo <whamcloud.maloo@gmail.com>
Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov>
Reviewed-by: Oleg Drokin <green@whamcloud.com>
LU-1415 tests: Handle OFD procfs changes

This patch handles these procfs entry changes in OFD:

  - obdfilter.*.mntdev -> osd-*.*.mntdev
  - obdfilter.*.<cache_related> -> osd-*.*.<cache_related>

Change-Id: Ie9fac69446b5c183bc8eed44a86338ef62197529
Signed-off-by: Li Wei <liwei@whamcloud.com>
Reviewed-on: http://review.whamcloud.com/2934
Reviewed-by: Yu Jian <yujian@whamcloud.com>
Tested-by: Hudson
Tested-by: Maloo <whamcloud.maloo@gmail.com>
Reviewed-by: Andreas Dilger <adilger@whamcloud.com>
Workaround for the weird Leaflet sizing bug.

Basically, make the map act as though the window was resized.  I tested it and it seems to work... but I wouldn't be surprised if it varied across OSs.
adding filter to views
csproj edit
Merge branch 'master' of github.com:Yogendrovich/ProjInfo
Implemented some more onclick events.
Added various asset dirs to /usr/share
Add a StaticPages controller
zz commit
added the basic restaurant helper class
implemented onCreate in the RestaurantHelper class
removed all of the extra thread and menu code in LunchList
added a RestaurantHelper to LunchList and an onDestroy method
implemented insert in the RestaurantHelper
modified onSave to save data to the database
added getters and a function to get all restaurants from the database
modified the RestaurantAdapter to extend CursorAdapter
modified populateFrom in the RestaurantHolder
cleaned up the arraylist references so that the cursor is now used
Added holding page
Resylted holding page
Add startup and shutdown documentation
izabrana tema i napravljena uvodna stranica
FLUID-4793: Fixing time stamps for JSON transcript files
FLUID-4793: Fixing timestamps for vtt files
FLUID-4793: Fixing test JSON and VTT files
Merge remote-tracking branch 'anvk/FLUID-4793' into demo

* anvk/FLUID-4793:
  FLUID-4793: Fixing test JSON and VTT files
  FLUID-4793: Fixing timestamps for vtt files
  FLUID-4793: Fixing time stamps for JSON transcript files
Merge branch 'demo' into FLUID-4786
vendor compiled assets
Updated public/index.html
Modify LWP::UserAgent used to respect proxy settings
Modify ulr_metrics call to explicitely define metrics

An API change by SEOmoz meant this method was no longer returning
any data, see https://github.com/adamtaylor/WWW-SEOmoz/issues/3.

We now have to explicitely request the data we want back so we've
added some default values to the request. Should be extended in
the future to allow the user to request the data they want.
Adding CNAME

github.adamwilcox.org
[CS] Flesh out event payloads in Statistics specs
[FEATURE] Statistics should expose call counts by route name
[FEATURE] Allow configuring the lifetime of a call object after hangup
Readded edit and add functionality to list
added grid labeler, in sci not
Fixed grammar errors and punct. inconsistency.
show bug links for regular RPMs too now (not only source)
Never remove players when unloading chunks. Fixes BUKKIT-3129

When unloading chunks we have a check to ensure we do not remove players
from the world due to the issues this would cause. However, our check
to see if the player is in this chunk is reversed and is in fact entirely
wrong. Even if the player isn't currently in this chunk we do not want
to remove them as that will still cause the same issues.
Don't update physics until after the place event. Fixes BUKKIT-3316

If you cancel a BlockPlaceEvent for a sign the world is updated as if
the block was placed and then destroyed. To avoid this we set the block
without updating physics then apply the update after the event.
Add BlockDiode from mc-dev for diff visibility.
Fire BlockRedstoneEvent for repeaters. Fixes BUKKIT-1157
Fix discrepancies in NBT and ItemMeta. Fixes BUKKIT-3279

An ItemStack gains the tag name "tag" when the stack is serialized
to NBT, however items don't have a tag *until* they are serialized at
least once. So to solve this, we remove the tag name when loading the
NBT data.

Another problem with NBT are TagLists, when transferring tag lists
between the server and the client the names are lost, and so we
simply don't add a name to the tag.
Fix removing enchantments causing the enchantment tag to remain.
Update maxhealth for entities that have variable max health. Fixes BUKKIT-3308

Slimes and wolves have health that can change based on certain
conditions. So we check if their max health should be updated, and if
it has been customized in any way.

We also scale the wolf's health for their tail
cooked up new draft epub
trying to fix html bug in declaration page
fixed html error in constitution page; generated draft epub
changes per second email (italics)
fixed company and company admin creation
プロジェクト廃止
プロジェクト廃止。
doc
cleanup
cleanup
Merge branch 'master' of github.com:ahmadnawid/NumberGame

Conflicts:
	README.md
Summary improvements.
Slight help text change.
Refactored creation of conditions and actions to support one-time activation.
Onetime activation to backend.
Onetime activation UI additions and backend fixes.
Fixed flight mode setting more. Run platformutil through invoker.
Changelog updates
Idle not activated when call in progress/active. Otherwise OK.
Removed unused roles and codepaths. QML/C++ warnings resolved. In other words, non-essential refactoring.
Merge branch 'idlefix' into devel
Unused parameter warning away
Refined real idle algo
Resolved some TODOs
Timestamp on condition signal
1.7.0 finalizing.
Commit from office. Updated the configuration
moved source directory
Added staging files.
Deleted a file.
Create index-without-contenteditable.html
fix xsendfile
Merge pull request #142 from nlegoff/xsendfile

fix xsendfile issue
Comunidad galeria "arreglado" (despues de oprimir una vez ver más
fotos, ya no se puede volver a ver el aviso) con el resize de las fotos
Comunidad casi arreglado. Faltan fotos de eventos que no tienen la misma
altura
Set compilation level to 'simple' for debug build.

In 'whitespace' mode --define param is ignored by Closure Compiler.
Added build targets 'firefox-debug' and 'firefox-release'.
flesh out new node data structure class
Remove rack dependency as it's now unnecessary
Upgrade to Rails 3.1.7
Upgrade to Rails 3.2 (3.2.7)
Avoid deprecation warnings for update_attribute
Fix the skin loading
inclusão dos dados de monitoramento do opennebula
remocao dos dados do opennebula

Signed-off-by: Anderson Moreira <anderson@rtsystems.org>
Añadido rdoc y toda la documentación necesaria en el código. Cambiada la licencia.
report duplicate if one point is contacted
add analyzer
add traj analyzer, not tested
traj analyzer, passed test, seems working
fix bug: align waters before study h-bond
exhaustivly search circles
Basic functionality now works
Significant UI change
Switched MonoGame to point to develop3d branch and some other misc edits.
Removed 'font-style: italic' for links
Erase regions from previous block before applying new ones.
Adding first draft of a JWT debugging tool
Improvements and fixes to the JWT tool.
added a few preventdefaults in jwttool
aslol
Let twitter_token be accessible
Merge pull request #158 from dgmdan/seeds

Let twitter_token be accessible
resolved conflicts
Merge branch 'master' of https://github.com/andrewhilts/WorldVuze
rename file
rename
Merge branch 'master' of https://github.com/luubert/WorldVuze
add logo to header
Poll for new content every 10 seconds
Display calculation time on Details screen
pivotal-tracker app #wip
Merge remote-tracking branch 'upstream/master' into pivotal

Conflicts:
	run_app.rb
Merge remote-tracking branch 'upstream/master' into pivotal
changes to form rendering
Merge remote-tracking branch 'anh/master' into pivotal

Conflicts:
	apps/pivotal/assets/views/button/overlay.hbs
working overlay. need to create some helpers to make this easy
Cleaning up campfire app
Merge remote-tracking branch 'upstream/master'
Added detail about the tasks 2 and 3 in the results chapter.
Added validate delegated onchange events on radio and select lists
Fixed reference to the swgpy module.
Added support for prompt default values to be a function that dynamically generates the default value. Added some i18n strings.
A test for including files
Rename to a .md file
ajustes nas traducoes do Rafael
Renamed class.
Added rules/tests for pegging runs.
Typo fix.
Work around for non-element insert point.

Refs #1577
Upgrade to new Ruby in rvmrc
Add more copy and regenerate styles
Can edit constants
Remove DisableTabCtrlVisualStyles() function. It is unneeded because owner draw tab control is used.
[maven-release-plugin] prepare release jenkins-1.471
[maven-release-plugin] prepare for next development iteration
updated changelog for release
releasing a new plugin parent POM
updated changelog as a part of the release
merged back the RC branch

Conflicts:
	plugins/pom.xml
Revert "Improved the mechanism of how we store passwords hashed."

This reverts commit ebc6af72e90cd14a77b41cccf807c3872cd53273.
fix license generation issue with encoding
creating an RC branch
the trunk is toward 1.473-SNAPSHOT
Merge remote-tracking branch 'origin/master'
Revert "Revert "Improved the mechanism of how we store passwords hashed.""
Merge remote-tracking branch 'upstream/master'
VERSION 1.1.7 Removed debug
VERSION 1.1.8: Fixed 'whats new' being empty.
fixed alerts and added to theme folder
updates
Travis WTF
Add support for alpha-auth stand alone vm. This commit requires a github private key which goes in chef/vendor/cookbooks/alpha-auth/files/default/default/id_rsa
Gravatar image of current_user in profil links to settings pane.
Fixing schema to get rid of rails 3.2 deprecation warning, updating readme with compatibility clause
Version bump to 1.0.1
updating gemspec
updating readme
Merge branch 'develop'
search result page frontend added
created Hash typecaster
remove svgz font until it is added: https://github.com/FortAwesome/Font-Awesome/issues/233
temporarily disabled cljsbuild
added a link to the site
Changed russian book to Gogol's Dead Souls
added instructions. changed css
Merge branch 'master' of github.com:bapehbe/word-inventor
test to true
handle concarve boundaries (hopefully)
added average separation distance lut so far
fix custom tito builder to handle --test builds correctly
/distribution/beaker/dogfood: only set kernel_options, not kernel_options_post
tests: trying to fix the deadlock in test_submit_job_wait

Not really sure if this will have any effect, but I am kind of grasping
at straws now...
/distribution/beaker/dogfood: another config option I missed
docs: describe Graphite integration in admin guide

Bug: 839583
Change-Id: If15e0c250d2005c21747c8205a18af5881676a5e
Merge "docs: describe Graphite integration in admin guide" into develop
Update notes for submitted changes

* update bkr harness-test command for 0.9
Fixed test page bug.
. explicitly link the benchmark file
Dudes can now move!
Don't require timeout, it's unused
Update src/main/java/net/benelog/oneftpserver/user/SingleUserManager.java
Part 2 works!!
- client is able to retrieve id and url of image, send it to server
- server responds with url of result
- TODO: replace img src in web page
Bump version, add Chrome Web Store instructions
우리은행 입출금 문자 추가.
Add print_response
fixed my own gantt jar size
added Hash files
tab stop list for 4 space indent
commit fix bug annotation
Refactor Entity name validation to reference repo.
SWC-259: Prevent entity owners from modifying their own permissions
SWC-259: Show e-mails and IDs in UserGroupSearchBox
Profession-Task beziehung pro Profession wegspeichen.
[debug an, getestet]
-aufräumen
+fehlermeldung
...
decomplection
Implemented (brute-force) generation of incorrect options for MC questions. Quite inefficient though.
Chicago API diffs
arxiv bugfixes
create paged index view for users
finish user adit, index, and destroy actions.
add user microposts
add user microposts
04052012
README
Réglé : Comment compter le nombre de competences dans la liste des projets
Competences peuvent etre changées

Les notifications ne sont pas encore disponibles
Added assn 3 file.
Add statsd output
currencies and employment status
Groups and Modules
Merge branch 'master' of
https://rbartolay@github.com/bpocareerhub/BCH-v2.0.git

Conflicts:
	BPO Career Hub v2.0/application/xml/Modules.xml
Email Notification and template for ticket 243 and 274
Correct errant newlines.
Alteracao de Scripts
Idea integration test.
BZ866327
Merge pull request #671 from bdecoste/master

Merged by openshift-bot
Minor fix for the kerberos/ldap sample config files

This is needed so that resources ending in .json, .html, .xml are supported.
This is needed for the web console calls into the broker.
Load obj - 2a versao.

Signed-off-by: Cristiano Bolla Fernandes <cristianobfernandes@gmail.com>
Load obj - 3a versao.

Signed-off-by: Cristiano Bolla Fernandes <cristianobfernandes@gmail.com>
1.1 release meta
added new files

sample breakout game
add basic stat counters
- private const
renamed tool-class
improvements to files model

references #25
add dev version of js
add notes to "After make install"
clause dag, to hold the parent/child relations for
inferences and simplifications (assuming a clause simplifies only to one other clause)
classic ping of death like fail
refactor - introduce core
better waiting
eviscerated AdminStringServer's init method
created a variable for callOnce(eachBack) that occurs in both branches of a conditional
replaced a ternary with an easier-to-read inverted if-else
replaced some missing images after theme update
Fix reload all button
hooked up validated to UI.
use CPPopUpMenuWindowLevel for _CPPopUpList's window level
Added syntax for chord .pro files
Use https repo address for guides so I can fetch it on machines without github ssh authentication
Fixed "Ineritance" typo in README
Merge pull request #1 from doismellburning/readme_typo_fix

Fixed "Ineritance" typo in README
ubuntu gitignore
Put the old BASIC version on the disk image, too.
Add BSD license (on disk image too) and extensively update README.
Mention licensing terms in the Ophis source code files.
trying to get google gtest working on visual studio 2012
move image reports to resources table
Fix for error fetching artifacts.
Merge pull request #9 from willaerk/master

Fix for error fetching artifacts.
add doc for skip options
reflect change
Issue #2, Set default handler to no-one
fix #1850: log summary starts with comma
Complete up to 6
Supression des fichiers contenant les chemins variables
Add some cursor pointers and clean up explainer text
load items which are unavaible on wowhead from armory
attempt at packaging
change erc connection port
JS: encapsulation and linting
Fix calendar image path for subdir'ed instances
Consistent use of double quotes vs. single quotes
full contact twitter id retrieval
merge conflict
add column detection in koptconfig
add auto straighten option for sanned pages
Minor fixes in views. Fixed some m2m forms
Merge branch 'gsoc2012' of git://github.com/cidadania/e-cidadania into gsoc2012
Merge branch 'gsoc2012' of git://github.com/cidadania/e-cidadania into gsoc2012
Merge branch 'gsoc2012' of git://github.com/cidadania/e-cidadania into gsoc2012
Fixed #211: Malformed event form
Added docprops and uicolor icons. Fixed indent/outdent icons.
Reverted a deleted line.
Draft 6

Signed-off-by: Clark <giorgos.lamprianidis@gmail.com>
notes from planet
Scale Delegate now ingerits from Multi Turn Effect
split out invite code
Added core package.
Move client package inside CapraVision.
Fix errors after reorganisation.
Added tools menu to main window.
Other files are now useless
Rename sources to imageproviders
Tools are modals
WinExec now support python syntax highlighting.
Fix precision in line testing.
issue #1446: fixed jsdoc comments
Merge pull request #521 from linshun/iss1446_v2.0

issue #1446: fixed jsdoc comments
don't want this anymore. screwed up Xcode build
fix error, dirty hack
Bit of work on examples.
Renamed file and let you pass in regex directly.
Few small fixes and updated version/readme.
Added the first Conditional execution program
Added More Tests to Admin
Did a lot of Messaging Stuff sitll Error Though
disable auto hint by default
Change is_a & add item to regex

is_a is deprecated in some versions of php.
regex was missing item

Signed-off-by: Bernard Robbins <BernardRobbinsIII@gmail.com>
Fixed bash prompt showing full working directory
fix mapnik tile URL
new import product
registrasi page
Merge branch 'master' of github.com:crewpuk/Lulu-delivery
issue 700: update to boost 1.49
issue 731: added new ScanSpec options to hadoop streaming mapreduce
issue 700: update to boost 1.49
issue 727: new config setting HdfsBroker.Hadoop.ConfDir
issue 817: fixed handling of DELETE in LOAD DATA INFILE
Fixed spurious failures of test Purge-indices-2
issue 815: remove rrdtool from the installation package
ifconfig_interface should output its output
Fixed magic p tag
Created override of onRestoreInstanceState in DetailForm.java to repopulate detail form with data stored in the bundle upon being restored (such as after rotation)
Update archiveBuilder.py

fixed indentation error
Fix broken jchronic URL
minor changes to freetext screen
changed icon. changed hist_detail_screen to relativeLayout anyway
Proper event dispatching.
by default user_language is unknown
Merge pull request #4 from suvit/master

when use example project, loading fixutre was failed
changed width on ios
finishing up user signup
update TestRetrieve and Get10qs
Changing headline color?
add body modifiers
add plugin.yml
add configuration, complete damages
Added some comments to specific pieces of code
Get ready for 0.08 release
Better auth support, added trigger on parameterless method call, default handler for auth
Patched Bug with checkboxes not visible from beginning
CSS-Files are now loaded correctly
calculate the amount of a resident's share of a particular cost

build share ratio dictionary in TransactionCategory, perform
calculation in Transaction
Conveyor printout
Output printing finished
output indexing error
Iterative output, conveyor ids
criando atom feed
acrescentando devise e envio de email em contato
Basic task creation
Reset password functionality added.
fix up UDK2010 fetch