diff
stringlengths 65
26.7k
| message
stringlengths 7
9.92k
|
|---|---|
diff --git a/src/Groups/ANDGroup.php b/src/Groups/ANDGroup.php
index <HASH>..<HASH> 100644
--- a/src/Groups/ANDGroup.php
+++ b/src/Groups/ANDGroup.php
@@ -99,7 +99,7 @@ class ANDGroup implements Group
if ( ! $this->isSet())
{
$responses[] = new Response(
- $this->getPrintableName().' must all be set'
+ $this->getPrintableName().' must be set'
);
$memberResponses = array();
|
update response to make sense in more cases
|
diff --git a/openquake/engine/engine.py b/openquake/engine/engine.py
index <HASH>..<HASH> 100644
--- a/openquake/engine/engine.py
+++ b/openquake/engine/engine.py
@@ -111,8 +111,7 @@ def parse_config(source):
File-like object containing the config parameters.
:returns:
A `dict` of the parameter keys and values parsed from the config file
- and a `dict` of :class:`~openquake.engine.db.models.Input` objects,
- keyed by the config file parameter.
+ and a `dict` of input model file paths keyed by input type.
These dicts are return as a tuple/pair.
"""
@@ -150,9 +149,7 @@ def parse_config(source):
# It's a relative path.
path = os.path.join(base_path, path)
- files[key] = create_input(
- path, input_type, prepare_user(getpass.getuser())
- )
+ files[input_type] = path
else:
params[key] = value
|
engine:
Updated parse_config to have less side-effects, and simplified its
return interface.
Instead of creating Input records, we just return a dict of the input
model file paths and leave the Input creation to a later function in
the workflow.
Former-commit-id: <I>e<I>b4e<I>a<I>a<I>cedcd<I>e3ac<I>b
|
diff --git a/lib/features/complex-cell/ComplexCell.js b/lib/features/complex-cell/ComplexCell.js
index <HASH>..<HASH> 100644
--- a/lib/features/complex-cell/ComplexCell.js
+++ b/lib/features/complex-cell/ComplexCell.js
@@ -15,8 +15,8 @@ var assign = require('lodash/object/assign'),
* Complex Property:
* - template: {DOMNode}
* HTML template of the complex content
- * - className: {String} (optional, defaults to 'complex-cell')
- * Defines the className which is set on the container of the complex cell
+ * - className: {String | String[]} (optional, defaults to 'complex-cell')
+ * Defines the classNames which are set on the container of the complex cell
* - offset: {Object} (option, defaults to {x: 0, y: 0})
* Defines the offset of the template from the top left corner of the cell
*
@@ -124,7 +124,13 @@ ComplexCell.prototype._createContainer = function(className, position) {
event.stopPropagation();
});
- domClasses(container).add(className);
+ if(typeof className === 'string') {
+ domClasses(container).add(className);
+ } else {
+ for(var i = 0; i < className.length; i++) {
+ domClasses(container).add(className[i]);
+ }
+ }
return container;
};
|
feat(complex-cell): allow setting multiple class names
related to CAM-<I>
|
diff --git a/src/main/java/org/mariadb/jdbc/internal/queryresults/resultset/MariaSelectResultSet.java b/src/main/java/org/mariadb/jdbc/internal/queryresults/resultset/MariaSelectResultSet.java
index <HASH>..<HASH> 100644
--- a/src/main/java/org/mariadb/jdbc/internal/queryresults/resultset/MariaSelectResultSet.java
+++ b/src/main/java/org/mariadb/jdbc/internal/queryresults/resultset/MariaSelectResultSet.java
@@ -1654,6 +1654,7 @@ public class MariaSelectResultSet implements ResultSet {
Calendar calendar = options.useLegacyDatetimeCode ? Calendar.getInstance() : cal;
synchronized (calendar) {
+ calendar.clear();
calendar.set(Calendar.YEAR, year);
calendar.set(Calendar.MONTH, month - 1);
calendar.set(Calendar.DAY_OF_MONTH, day);
|
[CONJ-<I>] Clear Calendar instance before using it
|
diff --git a/src/Network/FTP/Client/FtpClient.php b/src/Network/FTP/Client/FtpClient.php
index <HASH>..<HASH> 100644
--- a/src/Network/FTP/Client/FtpClient.php
+++ b/src/Network/FTP/Client/FtpClient.php
@@ -244,23 +244,6 @@ class FtpClient extends AbstractFtpClient {
}
/**
- * Returns a list of files in the given directory.
- *
- * @param string $directory The directory.
- * @return array Returns a list of files in the given directory.
- * @throws FtpException Throws a FTP exception if an error occurs.
- */
- public function mlsd(string $directory): array {
-
- $result = @ftp_mlsd($this->getConnection(), $directory);
- if (false === $result) {
- throw $this->newFtpException("ftp_mlsd failed: [{$directory}]");
- }
-
- return $result;
- }
-
- /**
* Retrieves a file from the FTP server and writes it to an open file (non-blocking).
*
* @param resource $localStream The local stream.
|
Remove a PHP <I> function used into FTP client
|
diff --git a/build.php b/build.php
index <HASH>..<HASH> 100755
--- a/build.php
+++ b/build.php
@@ -22,7 +22,7 @@ if ($phpcsViolations > 0) {
}
$phpunitConfiguration = PHPUnit_Util_Configuration::getInstance(__DIR__ . '/phpunit.xml');
-$phpunitArguments = array('coverageHtml' => 'coverage', 'configuration' => $phpunitConfiguration);
+$phpunitArguments = array('coverageHtml' => __DIR__ . '/coverage', 'configuration' => $phpunitConfiguration);
$testRunner = new PHPUnit_TextUI_TestRunner();
$result = $testRunner->doRun($phpunitConfiguration->getTestSuiteConfiguration(), $phpunitArguments);
if (!$result->wasSuccessful()) {
|
Use the full path to the code coverage.
|
diff --git a/setuptools/command/rotate.py b/setuptools/command/rotate.py
index <HASH>..<HASH> 100755
--- a/setuptools/command/rotate.py
+++ b/setuptools/command/rotate.py
@@ -2,6 +2,7 @@ from distutils.util import convert_path
from distutils import log
from distutils.errors import DistutilsOptionError
import os
+import shutil
from setuptools.extern import six
@@ -59,4 +60,7 @@ class rotate(Command):
for (t, f) in files:
log.info("Deleting %s", f)
if not self.dry_run:
- os.unlink(f)
+ if os.path.isdir(f):
+ shutil.rmtree(f)
+ else:
+ os.unlink(f)
|
Handle not-zip-safe egg (folder) deletion in rotate command
|
diff --git a/test/backends_bucket-at-most-once.js b/test/backends_bucket-at-most-once.js
index <HASH>..<HASH> 100644
--- a/test/backends_bucket-at-most-once.js
+++ b/test/backends_bucket-at-most-once.js
@@ -5,7 +5,7 @@ var should = require ('should');
var factory = null;
[
- {label: 'MongoDB Bucket', mq: require ('../backends/bucket-mongo')}
+ {label: 'MongoDB Bucket', mq: require ('../backends/bucket-mongo')}
].forEach (function (MQ_item) {
describe ('bucket-at-most-once with ' + MQ_item.label + ' queue backend', function () {
@@ -87,6 +87,7 @@ describe ('bucket-at-most-once with ' + MQ_item.label + ' queue backend', functi
cb();
})},
], function(err, results) {
+ q.drain();
done();
});
});
@@ -127,6 +128,7 @@ describe ('bucket-at-most-once with ' + MQ_item.label + ' queue backend', functi
cb();
})},
], function(err, results) {
+ q.drain();
done();
});
});
|
bucket-at-most-once test: added drain calls
|
diff --git a/src/Model.php b/src/Model.php
index <HASH>..<HASH> 100644
--- a/src/Model.php
+++ b/src/Model.php
@@ -36,6 +36,10 @@ trait Model
*/
public function __construct(iterable $input = null)
{
+ $cache = $this->__getModelPropertyDecorations();
+ foreach ($cache['properties'] as $field => $annotations) {
+ $this->$field = $this->ornamentalize($field, null);
+ }
if (isset($input)) {
foreach ($input as $key => $value) {
$this->$key = $this->ornamentalize($key, $value);
|
on initialization, always correctly set decorated properties (even with a null value)
|
diff --git a/src/components/Cards/ImageCard.js b/src/components/Cards/ImageCard.js
index <HASH>..<HASH> 100644
--- a/src/components/Cards/ImageCard.js
+++ b/src/components/Cards/ImageCard.js
@@ -9,7 +9,7 @@ export default class ImageCard extends React.Component {
return (
<Card onClick={onClick} className={styles.root}>
<img src={image} onLoad={onImageLoaded} />
- <h1>{text}</h1>
+ <h2>{text}</h2>
{description ? <p>{description}</p> : null}
</Card>
|
Make cards have h2s not h1s
|
diff --git a/connect.go b/connect.go
index <HASH>..<HASH> 100644
--- a/connect.go
+++ b/connect.go
@@ -140,6 +140,13 @@ const (
VIR_CONNECT_GET_ALL_DOMAINS_STATS_ENFORCE_STATS = VirConnectGetAllDomainStatsFlags(C.VIR_CONNECT_GET_ALL_DOMAINS_STATS_ENFORCE_STATS)
)
+type VirConnectFlags int
+
+const (
+ VIR_CONNECT_RO = VirConnectFlags(C.VIR_CONNECT_RO)
+ VIR_CONNECT_NO_ALIASES = VirConnectFlags(C.VIR_CONNECT_NO_ALIASES)
+)
+
type VirConnection struct {
ptr C.virConnectPtr
}
|
Add enum constants for connection open
|
diff --git a/src/Maatwebsite/Excel/Excel.php b/src/Maatwebsite/Excel/Excel.php
index <HASH>..<HASH> 100644
--- a/src/Maatwebsite/Excel/Excel.php
+++ b/src/Maatwebsite/Excel/Excel.php
@@ -117,8 +117,8 @@ class Excel extends \PHPExcel
// Load the file
$this->excel = $this->reader->load($this->file);
- // Return itself
- return $this;
+ // Return reader object for chaining methods from PHPExcel
+ return $this->excel;
}
/**
|
Changed return value of load() method
|
diff --git a/src/basic/Textarea.js b/src/basic/Textarea.js
index <HASH>..<HASH> 100644
--- a/src/basic/Textarea.js
+++ b/src/basic/Textarea.js
@@ -34,6 +34,7 @@ class Textarea extends Component {
this.props.placeholderTextColor ? this.props.placeholderTextColor : variables.inputColorPlaceholder
}
underlineColorAndroid="rgba(0,0,0,0)"
+ editable={this.props.disabled ? false : true}
/>
);
}
|
Added disabled prop to TextArea
|
diff --git a/DeviceDetector.php b/DeviceDetector.php
index <HASH>..<HASH> 100644
--- a/DeviceDetector.php
+++ b/DeviceDetector.php
@@ -501,7 +501,7 @@ class DeviceDetector
* As most touch enabled devices are tablets and only a smaller part are desktops/notebooks we assume that
* all Windows 8 touch devices are tablets.
*/
- if (is_null($this->device) && in_array($this->getOs('short_name'), array('WI8', 'W81', 'WRT')) && $this->isTouchEnabled()) {
+ if (is_null($this->device) && in_array($this->getOs('short_name'), array('WI8', 'W81', 'WRT', 'WR2')) && $this->isTouchEnabled()) {
$this->device = DeviceParserAbstract::DEVICE_TYPE_TABLET;
}
|
detection for windows rt <I> tablets
|
diff --git a/src/Drupal/Driver/DrushDriver.php b/src/Drupal/Driver/DrushDriver.php
index <HASH>..<HASH> 100644
--- a/src/Drupal/Driver/DrushDriver.php
+++ b/src/Drupal/Driver/DrushDriver.php
@@ -134,6 +134,7 @@ class DrushDriver implements DriverInterface {
public function drush($command, array $arguments = array(), array $options = array()) {
$arguments = implode(' ', $arguments);
$string_options = '';
+ $options['nocolor'] => '';
foreach ($options as $name => $value) {
if (is_null($value)) {
$string_options .= ' --' . $name;
|
Issue #<I> by grendzy: Fixed DrushDriver: ANSI color output confuses XML parsers.
|
diff --git a/client/connection.go b/client/connection.go
index <HASH>..<HASH> 100644
--- a/client/connection.go
+++ b/client/connection.go
@@ -10,10 +10,10 @@ import (
"strings"
"time"
+ log "gopkg.in/inconshreveable/log15.v2"
"gopkg.in/macaroon-bakery.v2/httpbakery"
"github.com/lxc/lxd/shared"
- log "github.com/lxc/lxd/shared/log15"
"github.com/lxc/lxd/shared/logger"
"github.com/lxc/lxd/shared/simplestreams"
)
|
client: Update imports for log<I>
|
diff --git a/src/engine/GoalTree.js b/src/engine/GoalTree.js
index <HASH>..<HASH> 100644
--- a/src/engine/GoalTree.js
+++ b/src/engine/GoalTree.js
@@ -217,9 +217,6 @@ let resolveSimpleActions = function resolveSimpleActions(clause, possibleActions
});
thetaSet.forEach((tuple) => {
- if (tuple.unresolved.length > 0) {
- return;
- }
tuple.candidates.forEach((literal) => {
candidateActions.add(literal);
});
|
remove empty unresolved check for candidate actions selection
|
diff --git a/lib/roger_style_guide/templates/mustache/mustache_template.rb b/lib/roger_style_guide/templates/mustache/mustache_template.rb
index <HASH>..<HASH> 100644
--- a/lib/roger_style_guide/templates/mustache/mustache_template.rb
+++ b/lib/roger_style_guide/templates/mustache/mustache_template.rb
@@ -4,8 +4,14 @@ module RogerStyleGuide::Templates::Mustache
# Mustach template wrapper which handles partial
# resolving.
class MustacheTemplate < ::Mustache
+ attr_reader :template_context
+
def render(template, data, template_context = nil)
- @template_context = template_context
+ if template_context
+ @template_context = template_context
+ elsif data.respond_to?(:template_context)
+ @template_context = data.template_context
+ end
super(template, data)
end
|
Pass template context to lower level mustache renderers
|
diff --git a/test/helpers/kubectl.go b/test/helpers/kubectl.go
index <HASH>..<HASH> 100644
--- a/test/helpers/kubectl.go
+++ b/test/helpers/kubectl.go
@@ -1531,7 +1531,7 @@ func (kub *Kubectl) WaitForCiliumInitContainerToFinish() error {
}
for _, pod := range podList.Items {
for _, v := range pod.Status.InitContainerStatuses {
- if v.State.Terminated.Reason != "Completed" || v.State.Terminated.ExitCode != 0 {
+ if v.State.Terminated != nil && (v.State.Terminated.Reason != "Completed" || v.State.Terminated.ExitCode != 0) {
kub.Logger().WithFields(logrus.Fields{
"podName": pod.Name,
"currentState": v.State.String(),
|
Add nil check for init container terminated state
|
diff --git a/test/index.js b/test/index.js
index <HASH>..<HASH> 100644
--- a/test/index.js
+++ b/test/index.js
@@ -27,6 +27,10 @@ describe('stripe-as-promised', () => {
sandbox.restore();
});
+ it('throws if no Promise is provided', () => {
+ expect(stripeAsPromised.bind()).to.throw('Promise');
+ });
+
it('passes through utility methods', () => {
promisify();
expect(stripe.card.validateCardNumber).to.equal(Stripe.card.validateCardNumber);
|
Test w/out promise ctor
|
diff --git a/lib/data_mapper/mapper/attribute_set.rb b/lib/data_mapper/mapper/attribute_set.rb
index <HASH>..<HASH> 100644
--- a/lib/data_mapper/mapper/attribute_set.rb
+++ b/lib/data_mapper/mapper/attribute_set.rb
@@ -90,7 +90,9 @@ module DataMapper
end
end
- each { |attribute| instance << attribute.clone unless instance[attribute.name] }
+ each do |attribute|
+ instance << attribute.clone unless instance[attribute.name]
+ end
instance
end
|
Use do/end blocks for #each in AttributeSet#merge
|
diff --git a/pelix/framework.py b/pelix/framework.py
index <HASH>..<HASH> 100644
--- a/pelix/framework.py
+++ b/pelix/framework.py
@@ -283,7 +283,8 @@ class Bundle(object):
self._state = previous_state
# Re-raise directly Pelix exceptions
- _logger.exception("Pelix error raised by %s", self.__name)
+ _logger.exception("Pelix error raised by %s while starting",
+ self.__name)
raise
except Exception as ex:
@@ -291,7 +292,8 @@ class Bundle(object):
self._state = previous_state
# Raise the error
- _logger.exception("Error raised by %s", self.__name)
+ _logger.exception("Error raised by %s while stopping",
+ self.__name)
raise BundleException(ex)
# Bundle is now active
@@ -324,8 +326,18 @@ class Bundle(object):
# Call the start method
stopper(self.__context)
+ except (FrameworkException, BundleException) as ex:
+ # Restore previous state
+ self._state = previous_state
+
+ # Re-raise directly Pelix exceptions
+ _logger.exception("Pelix error raised by %s while stopping",
+ self.__name)
+ exception = ex
+
except Exception as ex:
- _logger.exception("Error calling the activator")
+ _logger.exception("Error raised by %s while stopping",
+ self.__name)
# Store the exception (raised after service clean up)
exception = BundleException(ex)
|
Same exception behavior for bundle.start/stop
Re-raise the exception raised by the bundle activator on start or stop
without converting it, if it is a Pelix exception (Bundle/FrameworkException)
|
diff --git a/spec/clamp/command_spec.rb b/spec/clamp/command_spec.rb
index <HASH>..<HASH> 100644
--- a/spec/clamp/command_spec.rb
+++ b/spec/clamp/command_spec.rb
@@ -435,6 +435,19 @@ describe Clamp::Command do
end
+ context "with option arguments that look like options" do
+
+ before do
+ command.parse(%w[--flavour=-dashing- --scoops -1])
+ end
+
+ it "sets the options" do
+ expect(command.flavour).to eq("-dashing-")
+ expect(command.scoops).to eq(-1)
+ end
+
+ end
+
context "with option-like things beyond the arguments" do
it "treats them as positional arguments" do
|
Test behaviour of option arguments that look like options.
This is a (failed) attempt to reproduce #<I>. Having failed to
reproduce, I realise I've actually mis-interpreted #<I>. But this
is still a useful test.
|
diff --git a/upload/catalog/controller/payment/twocheckout.php b/upload/catalog/controller/payment/twocheckout.php
index <HASH>..<HASH> 100644
--- a/upload/catalog/controller/payment/twocheckout.php
+++ b/upload/catalog/controller/payment/twocheckout.php
@@ -7,7 +7,7 @@ class ControllerPaymentTwoCheckout extends Controller {
$order_info = $this->model_checkout_order->getOrder($this->session->data['order_id']);
- $this->data['action'] = 'https://www.2checkout.com/checkout/spurchase';
+ $this->data['action'] = 'https://www.2checkout.com/checkout/purchase';
$this->data['sid'] = $this->config->get('twocheckout_account');
$this->data['currency_code'] = $order_info['currency_code'];
|
2Checkout no longer has a seperate URL for the single page checkout routine.
|
diff --git a/lxd/cluster/gateway.go b/lxd/cluster/gateway.go
index <HASH>..<HASH> 100644
--- a/lxd/cluster/gateway.go
+++ b/lxd/cluster/gateway.go
@@ -407,7 +407,7 @@ func (g *Gateway) raftDial() client.DialFunc {
listener.Close()
- go dqliteProxy("raftDial", g.stopCh, conn, goUnix)
+ go dqliteProxy("raft", g.stopCh, conn, goUnix)
return cUnix, nil
}
@@ -1075,7 +1075,7 @@ func runDqliteProxy(stopCh chan struct{}, bindAddress string, acceptCh chan net.
continue
}
- go dqliteProxy("runDqliteProxy", stopCh, remote, local)
+ go dqliteProxy("dqlite", stopCh, remote, local)
}
}
|
lxd/cluster/gateway: Standardise logging naming of dqliteProxy and dqliteNetworkDial
|
diff --git a/src/Symfony/Component/DomCrawler/Tests/CrawlerTest.php b/src/Symfony/Component/DomCrawler/Tests/CrawlerTest.php
index <HASH>..<HASH> 100755
--- a/src/Symfony/Component/DomCrawler/Tests/CrawlerTest.php
+++ b/src/Symfony/Component/DomCrawler/Tests/CrawlerTest.php
@@ -81,9 +81,6 @@ class CrawlerTest extends \PHPUnit_Framework_TestCase
$this->assertEquals('foo', $crawler->filterXPath('//div')->attr('class'), '->addHtmlContent() adds nodes from an HTML string');
}
- /**
- * @covers Symfony\Component\DomCrawler\Crawler::addHtmlContent
- */
public function testAddHtmlContentWithBaseTag()
{
$crawler = new Crawler();
|
removed @covers annotations in tests
|
diff --git a/cmd/server-startup-msg.go b/cmd/server-startup-msg.go
index <HASH>..<HASH> 100644
--- a/cmd/server-startup-msg.go
+++ b/cmd/server-startup-msg.go
@@ -109,7 +109,7 @@ func printServerCommonMsg(apiEndpoints []string) {
apiEndpointStr := strings.Join(apiEndpoints, " ")
// Colorize the message and print.
- log.Println(colorBlue("\nEndpoint: ") + colorBold(fmt.Sprintf(getFormatStr(len(apiEndpointStr), 1), apiEndpointStr)))
+ log.Println(colorBlue("Endpoint: ") + colorBold(fmt.Sprintf(getFormatStr(len(apiEndpointStr), 1), apiEndpointStr)))
log.Println(colorBlue("AccessKey: ") + colorBold(fmt.Sprintf("%s ", cred.AccessKey)))
log.Println(colorBlue("SecretKey: ") + colorBold(fmt.Sprintf("%s ", cred.SecretKey)))
if region != "" {
|
Remove unnecessary newline at beginning of server output (#<I>)
|
diff --git a/indra/databases/identifiers.py b/indra/databases/identifiers.py
index <HASH>..<HASH> 100644
--- a/indra/databases/identifiers.py
+++ b/indra/databases/identifiers.py
@@ -35,7 +35,7 @@ identifiers_mappings = {
non_registry = {
'SDIS', 'SCHEM', 'SFAM', 'SCOMP', 'HMS-LINCS', 'NXPFA',
'OMIM', 'LSPCI', 'UPLOC', 'BFO', 'CCLE', 'CLO', 'GENBANK',
- 'DRUGBANK.SALT', 'SMILES', 'NIHREPORTER.PROJECT', 'GOOGLE.PATENT'
+ 'DRUGBANK.SALT', 'SMILES', 'NIHREPORTER.PROJECT', 'GOOGLE.PATENT', 'SPINE'
}
# These are reverse mappings from identifiers.org namespaces to INDRA
|
Add more identifiers missing from registry
|
diff --git a/src/Ufo/Widgets/WidgetsStorageInterface.php b/src/Ufo/Widgets/WidgetsStorageInterface.php
index <HASH>..<HASH> 100644
--- a/src/Ufo/Widgets/WidgetsStorageInterface.php
+++ b/src/Ufo/Widgets/WidgetsStorageInterface.php
@@ -13,5 +13,22 @@ use Ufo\Core\Section;
interface WidgetsStorageInterface
{
+ /**
+ * @param \Ufo\Core\Section $section
+ * @return array
+ *
+ * return array structure:
+ * [
+ * 'place 1 name' => [
+ * Widget $widget1,
+ * Widget $widget2,
+ * ...
+ * ],
+ * 'place 2 name' => [
+ * ...
+ * ],
+ * ...
+ * ]
+ */
public function getWidgets(Section $section): array;
}
|
chore: describe returning value structure in phpdoc
|
diff --git a/spec/adhearsion/punchblock/commands/output_spec.rb b/spec/adhearsion/punchblock/commands/output_spec.rb
index <HASH>..<HASH> 100644
--- a/spec/adhearsion/punchblock/commands/output_spec.rb
+++ b/spec/adhearsion/punchblock/commands/output_spec.rb
@@ -185,6 +185,7 @@ module Adhearsion
describe "if an audio file cannot be found" do
before do
+ pending
mock_execution_environment.should_receive(:play_audio).with(args[0]).and_return(true).ordered
mock_execution_environment.should_receive(:play_audio).with(args[1]).and_return(false).ordered
mock_execution_environment.should_receive(:play_audio).with(args[2]).and_return(true).ordered
|
[CS] Fix a further failing test pending
|
diff --git a/lib/octokit/preview.rb b/lib/octokit/preview.rb
index <HASH>..<HASH> 100644
--- a/lib/octokit/preview.rb
+++ b/lib/octokit/preview.rb
@@ -16,7 +16,7 @@ module Octokit
:traffic => 'application/vnd.github.spiderman-preview'.freeze,
:org_membership => 'application/vnd.github.korra-preview'.freeze,
:reviews => 'application/vnd.github.black-cat-preview'.freeze,
- :integrations => 'Accept: application/vnd.github.machine-man-preview+json'.freeze
+ :integrations => 'application/vnd.github.machine-man-preview+json'.freeze
}
def ensure_api_media_type(type, options)
|
Fix incorrect mimetype for integrations in PREVIEW_TYPES
|
diff --git a/src/context/dependencies/verifyInstalledProjectDependencies.js b/src/context/dependencies/verifyInstalledProjectDependencies.js
index <HASH>..<HASH> 100644
--- a/src/context/dependencies/verifyInstalledProjectDependencies.js
+++ b/src/context/dependencies/verifyInstalledProjectDependencies.js
@@ -24,7 +24,7 @@ export default function verifyInstalledProjectDependencies({ dependencies, devDe
`You have some dependencies in your package.json that also have been exported by extensions. This is probably a mistake.
${underline('Roc will prioritize the ones exported by the extensions.')}
-You can override this by adding "¡" to the start of the require/import in the code, see documentation for more info.
+You can override this by adding "_" to the start of the require/import in the code, see documentation for more info.
Dependencies that is both exported and in the projects package.json:
${matches.map((match) => `- ${bold(match.name)} ${dim('from')} ` +
|
Corrected hint about how to opt-out from the Roc dependency management
|
diff --git a/parsl/tests/test_ipp/bash_app.py b/parsl/tests/test_ipp/bash_app.py
index <HASH>..<HASH> 100644
--- a/parsl/tests/test_ipp/bash_app.py
+++ b/parsl/tests/test_ipp/bash_app.py
@@ -12,7 +12,7 @@ import argparse
# parsl.set_stream_logger()
workers = IPyParallelExecutor()
-dfk = DataFlowKernel(workers)
+dfk = DataFlowKernel(executors=[workers])
@App('bash', dfk)
|
Add missing keyword to DFK instantiation
Fixes #<I>.
|
diff --git a/src/vimpdb/proxy.py b/src/vimpdb/proxy.py
index <HASH>..<HASH> 100755
--- a/src/vimpdb/proxy.py
+++ b/src/vimpdb/proxy.py
@@ -37,6 +37,8 @@ class ProxyToVim(object):
return output.strip()
def _send(self, command):
+ # add ':<BS>' to hide last keys sent in VIM command-line
+ command = ''.join((command, ':<BS>'))
return_code = call([self.vim_client_script, '--servername',
self.server_name, '--remote-send', command])
if return_code:
|
less noise on VIM command-line
|
diff --git a/worker.go b/worker.go
index <HASH>..<HASH> 100644
--- a/worker.go
+++ b/worker.go
@@ -392,10 +392,6 @@ func (tw *SpanWorker) Work() {
wg.Add(1)
go func(i int, sink sinks.SpanSink, span *ssf.SSFSpan, wg *sync.WaitGroup) {
start := time.Now()
- defer func() {
- atomic.AddInt64(&tw.cumulativeTimes[i],
- int64(time.Since(start)/time.Nanosecond))
- }()
// Give each sink a change to ingest.
err := sink.Ingest(span)
if err != nil {
@@ -407,6 +403,8 @@ func (tw *SpanWorker) Work() {
ssf.Count("worker.span.ingest_error_total", 1, tags))
}
}
+ atomic.AddInt64(&tw.cumulativeTimes[i],
+ int64(time.Since(start)/time.Nanosecond))
wg.Done()
}(i, s, m, &wg)
}
|
Don't defer counting the cumulative time spent in span processing
|
diff --git a/treetime/treetime.py b/treetime/treetime.py
index <HASH>..<HASH> 100644
--- a/treetime/treetime.py
+++ b/treetime/treetime.py
@@ -476,6 +476,7 @@ class TreeTime(ClockTree):
#(Without outgroup_branch_length, gives a trifurcating root, but this will mean
#mutations may have to occur multiple times.)
self.tree.root_with_outgroup(new_root, outgroup_branch_length=new_root.branch_length/2)
+ self.tree.root.clades.sort(key = lambda x:x.count_terminals())
self.get_clock_model(covariation=use_cov, slope = slope)
|
sort clades by leaves after rooting
|
diff --git a/output/Html.php b/output/Html.php
index <HASH>..<HASH> 100644
--- a/output/Html.php
+++ b/output/Html.php
@@ -121,23 +121,21 @@ abstract class QM_Output_Html extends QM_Output {
/**
* Returns the column sorter controls. Safe for output.
*
- * @TODO needs to be converted to use a button for semantics and a11y.
- *
* @param string $heading Heading text for the column. Optional.
* @return string Markup for the column sorter controls.
*/
protected function build_sorter( $heading = '' ) {
$out = '';
- $out .= '<div class="qm-th">';
+ $out .= '<label class="qm-th">';
$out .= '<span class="qm-sort-heading">';
if ( $heading ) {
$out .= esc_html( $heading );
}
$out .= '</span>';
- $out .= '<span class="qm-sort-controls">';
+ $out .= '<button class="qm-sort-controls">';
$out .= '<span class="dashicons qm-sort-arrow" aria-hidden="true"></span>';
- $out .= '</span>';
- $out .= '</div>';
+ $out .= '</button>';
+ $out .= '</label>';
return $out;
}
|
Switch to using labels and buttons for table sorting controls.
|
diff --git a/lib/setup.php b/lib/setup.php
index <HASH>..<HASH> 100644
--- a/lib/setup.php
+++ b/lib/setup.php
@@ -406,12 +406,6 @@ global $SCRIPT;
$CFG->javascript = $CFG->libdir .'/javascript.php';
$CFG->moddata = 'moddata';
-// Alas, in some cases we cannot deal with magic_quotes.
- if (defined('MOODLE_SANE_INPUT') && ini_get_bool('magic_quotes_gpc')) {
- mdie("Facilities that require MOODLE_SANE_INPUT "
- . "cannot work with magic_quotes_gpc. Please disable "
- . "magic_quotes_gpc.");
- }
/// A hack to get around magic_quotes_gpc being turned on
/// It is strongly recommended to disable "magic_quotes_gpc"!
if (ini_get_bool('magic_quotes_gpc')) {
|
MDL-<I> removing magic_quotes test from setup.php when MOODLE_SANE_INPUT defined, scripts must find better way to inform admins, sorry
|
diff --git a/tests/TestCase/Routing/RouterTest.php b/tests/TestCase/Routing/RouterTest.php
index <HASH>..<HASH> 100644
--- a/tests/TestCase/Routing/RouterTest.php
+++ b/tests/TestCase/Routing/RouterTest.php
@@ -333,6 +333,25 @@ class RouterTest extends TestCase {
}
/**
+ * Test that RouterCollection::routes() gets the list of connected routes.
+ *
+ * @return void
+ */
+ public function testRouteCollectionRoutes() {
+ $collection = new RouteCollection();
+ Router::setRouteCollection($collection);
+ Router::mapResources('Posts');
+
+ $routes = $collection->routes();
+
+ $this->assertEquals(count($routes), 6);
+ $this->assertInstanceOf('Cake\Routing\Route\Route', $routes[0]);
+ $this->assertEquals($collection->get(0), $routes[0]);
+ $this->assertInstanceOf('Cake\Routing\Route\Route', $routes[5]);
+ $this->assertEquals($collection->get(5), $routes[5]);
+ }
+
+/**
* Test mapResources with a plugin and prefix.
*
* @return void
|
Test that RouterCollection::routes() gets the list of connected routes.
|
diff --git a/plugins/websocket/src/main/java/greycat/websocket/WSServerWithWorkers.java b/plugins/websocket/src/main/java/greycat/websocket/WSServerWithWorkers.java
index <HASH>..<HASH> 100644
--- a/plugins/websocket/src/main/java/greycat/websocket/WSServerWithWorkers.java
+++ b/plugins/websocket/src/main/java/greycat/websocket/WSServerWithWorkers.java
@@ -303,9 +303,12 @@ public class WSServerWithWorkers implements WebSocketConnectionCallback, Callbac
}
break;
case WorkerAffinity.TASK_WORKER: {
+ //format: <byte>#<int>#<int>#
BufferIterator it = jobBuffer.iterator();
Buffer bufferTypeBufferView = it.next();
- Buffer respChannelBufferView = it.next();
+
+ it.skip(5); // skip mailbox <int>#
+
Buffer callbackBufferView = it.next();
int callbackId = Base64.decodeToIntWithBounds(callbackBufferView, 0, callbackBufferView.length());
|
Fix WSServer with workers (protect against callback <I>)
|
diff --git a/shell.js b/shell.js
index <HASH>..<HASH> 100755
--- a/shell.js
+++ b/shell.js
@@ -63,7 +63,7 @@ function loadBot() {
}
loadBot();
-fs.watch(opts.brain, {recursive: true}, function() {
+fs.watch(opts.brain, {recursive: false}, function() {
console.log("");
console.log('[INFO] Brain changed, reloading bot.');
rl.prompt();
@@ -98,8 +98,10 @@ rl.on('line', function(cmd) {
// Handle commands.
if (cmd === "/help") {
help();
+ } else if (cmd.indexOf("/data") === 0) {
+ console.log(bot.getUservars("localuser"));
} else if (cmd.indexOf("/eval ") === 0) {
- eval(cmd.replace("/eval ", ""));
+ console.log(eval(cmd.replace("/eval ", "")));
} else if (cmd.indexOf("/log ") === 0) {
console.log(eval(cmd.replace("/log ", "")));
} else if (cmd === "/quit") {
|
Make fs.watch non recursive (could be another option flag if needed)
|
diff --git a/tests/Doctrine/Tests/ORM/UnitOfWorkTest.php b/tests/Doctrine/Tests/ORM/UnitOfWorkTest.php
index <HASH>..<HASH> 100644
--- a/tests/Doctrine/Tests/ORM/UnitOfWorkTest.php
+++ b/tests/Doctrine/Tests/ORM/UnitOfWorkTest.php
@@ -419,6 +419,13 @@ class UnitOfWorkTest extends OrmTestCase
];
}
+ public function testRegisteringAManagedInstanceRequiresANonEmptyIdentifier()
+ {
+ $this->expectException(ORMInvalidArgumentException::class);
+
+ $this->_unitOfWork->registerManaged(new EntityWithBooleanIdentifier(), [], []);
+ }
+
/**
* @dataProvider entitiesWithInvalidIdentifiersProvider
*
|
Registering a managed entity with an empty identifier is to be disallowed
|
diff --git a/beamline/models.py b/beamline/models.py
index <HASH>..<HASH> 100644
--- a/beamline/models.py
+++ b/beamline/models.py
@@ -202,11 +202,12 @@ class Models(object):
.format(cnt=cnt, name=e.name, type=e.typename, classname=e.__class__.__name__))
cnt += 1
- def draw(self, startpoint=(0, 0), showfig=False):
+ def draw(self, startpoint=(0, 0), mode='plain', showfig=False):
""" lattice visualization
:param startpoint: start drawing point coords, default: (0, 0)
:param showfig: show figure or not, default: False
+ :param mode: artist mode, 'plain' or 'fancy', 'plain' by default
"""
p0 = startpoint
angle = 0.0
@@ -214,7 +215,7 @@ class Models(object):
xmin0, xmax0, ymin0, ymax0 = 0, 0, 0, 0
xmin, xmax, ymin, ymax = 0, 0, 0, 0
for ele in self._lattice_eleobjlist:
- ele.setDraw(p0=p0, angle=angle)
+ ele.setDraw(p0=p0, angle=angle, mode=mode)
angle += ele.next_inc_angle
#print ele.name, ele.next_inc_angle, angle
patchlist.extend(ele._patches)
|
add artist mode option of method draw()
- by defauly mode is 'plain', which shows flat rectangles
for magnetic elements
- 'fancy' mode enabled when mode is set to be 'fancy' with
much more beautiful illustration
|
diff --git a/test.py b/test.py
index <HASH>..<HASH> 100644
--- a/test.py
+++ b/test.py
@@ -7,6 +7,7 @@ import tempfile
import sys
import sh
import platform
+from functools import wraps
# we have to use the real path because on osx, /tmp is a symlink to
# /private/tmp, and so assertions that gettempdir() == sh.pwd() will fail
@@ -24,19 +25,27 @@ THIS_DIR = os.path.dirname(os.path.abspath(__file__))
skipUnless = getattr(unittest, "skipUnless", None)
if not skipUnless:
- def skipUnless(*args, **kwargs):
- def wrapper(thing): return thing
+ # our stupid skipUnless wrapper for python2.6
+ def skipUnless(condition, reason):
+ def wrapper(test):
+ if condition:
+ return test
+ else:
+ @wraps(test)
+ def skip(*args, **kwargs):
+ return
+ return skip
return wrapper
requires_posix = skipUnless(os.name == "posix", "Requires POSIX")
requires_utf8 = skipUnless(sh.DEFAULT_ENCODING == "UTF-8", "System encoding must be UTF-8")
-def create_tmp_test(code):
+def create_tmp_test(code, prefix="tmp"):
""" creates a temporary test file that lives on disk, on which we can run
python with sh """
- py = tempfile.NamedTemporaryFile()
+ py = tempfile.NamedTemporaryFile(prefix=prefix)
if IS_PY3:
code = bytes(code, "UTF-8")
py.write(code)
|
skipUnless never actually worked in py<I>, also add prefix ability to named temp test
|
diff --git a/dev/com.ibm.ws.io.smallrye.graphql/src/io/smallrye/graphql/cdi/config/GraphQLConfig.java b/dev/com.ibm.ws.io.smallrye.graphql/src/io/smallrye/graphql/cdi/config/GraphQLConfig.java
index <HASH>..<HASH> 100644
--- a/dev/com.ibm.ws.io.smallrye.graphql/src/io/smallrye/graphql/cdi/config/GraphQLConfig.java
+++ b/dev/com.ibm.ws.io.smallrye.graphql/src/io/smallrye/graphql/cdi/config/GraphQLConfig.java
@@ -43,11 +43,6 @@ public class GraphQLConfig implements Config {
private String fieldVisibility = Config.FIELD_VISIBILITY_DEFAULT;
- public GraphQLConfig() {
- //hideList = mergeList(hideList, blackList);
- //showList = mergeList(showList, whiteList);
- }
-
@Override
public String getDefaultErrorMessage() {
return defaultErrorMessage;
|
Remove unnecessary comments / empty constructor
|
diff --git a/Swat/SwatTableViewColumn.php b/Swat/SwatTableViewColumn.php
index <HASH>..<HASH> 100644
--- a/Swat/SwatTableViewColumn.php
+++ b/Swat/SwatTableViewColumn.php
@@ -514,6 +514,8 @@ class SwatTableViewColumn extends SwatCellRendererContainer
*/
protected function getCSSClassNames()
{
+ $classes = array();
+
// instance specific class
if ($this->id !== null && !$this->has_auto_id) {
$column_class = str_replace('_', '-', $this->id);
@@ -521,7 +523,7 @@ class SwatTableViewColumn extends SwatCellRendererContainer
}
// base classes
- $classes = $this->getBaseCSSClassNames();
+ $classes = array_merge($classes, $this->getBaseCSSClassNames());
// user-specified classes
$classes = array_merge($classes, $this->classes);
|
include instance specific class fixes (<I>) SwatTableViewColumns aren't
outputting their IDs as classes, as per the documentation.
svn commit r<I>
|
diff --git a/web/db/mongo/__init__.py b/web/db/mongo/__init__.py
index <HASH>..<HASH> 100644
--- a/web/db/mongo/__init__.py
+++ b/web/db/mongo/__init__.py
@@ -65,7 +65,7 @@ class MongoDBConnection(object):
client = self.client = MongoClient(self.uri, **self.config)
if self.minimum:
- version = tuple(client.server_info()['version'].split('.'))
+ version = tuple(int(i) for i in client.server_info()['version'].split('.'))
if version < self.minimum:
raise RuntimeError("Unsupported MongoDB server version: " + ".".join(version))
|
Correctly compare MongoDB versions.
|
diff --git a/src/Database/Pivot.php b/src/Database/Pivot.php
index <HASH>..<HASH> 100644
--- a/src/Database/Pivot.php
+++ b/src/Database/Pivot.php
@@ -43,10 +43,13 @@ class Pivot extends Model
* @param bool $exists
* @return void
*/
- public function __construct(ModelBase $parent, $attributes, $table, $exists = FALSE)
+ public function __construct(ModelBase $parent = null, $attributes = [], $table = null, $exists = FALSE)
{
parent::__construct();
+ if (is_null($parent))
+ return;
+
// The pivot model is a "dynamic" model since we will set the tables dynamically
// for the instance. This allows it work for any intermediate tables for the
// many to many relationship that are defined by this developer's classes.
|
Fix error with Pivot class caused by newly introduced Attribute class in L8+
|
diff --git a/rdp_darwin.go b/rdp_darwin.go
index <HASH>..<HASH> 100644
--- a/rdp_darwin.go
+++ b/rdp_darwin.go
@@ -22,6 +22,17 @@
package main
+import (
+ "fmt"
+)
+
func rdpLaunchNative(instance *Instance, private bool, index int, arguments []string, prompt bool, username string) error {
+ file, err := rdpCreateFile(instance, private, index, username)
+ if err != nil {
+ return err
+ }
+
+ fmt.Println(file, instance.AdminPassword)
+
return nil
}
|
Create an RDP file on Mac OS X.
|
diff --git a/vsphere/distributed_virtual_switch_structure.go b/vsphere/distributed_virtual_switch_structure.go
index <HASH>..<HASH> 100644
--- a/vsphere/distributed_virtual_switch_structure.go
+++ b/vsphere/distributed_virtual_switch_structure.go
@@ -749,7 +749,7 @@ func schemaDVSCreateSpec() map[string]*schema.Schema {
"version": {
Type: schema.TypeString,
Computed: true,
- Description: "The version of this virtual switch. Allowed versions are 7.0.0, 6.5.0, 6.0.0, 5.5.0, 5.1.0, and 5.0.0.",
+ Description: "The version of this virtual switch. Allowed versions are 7.0.3, 7.0.0, 6.6.0, 6.5.0, 6.0.0, 5.5.0, 5.1.0, and 5.0.0.",
Optional: true,
ValidateFunc: validation.StringInSlice(dvsVersions, false),
},
|
Update schemaDVSCreateSpec description
Updates schemaDVSCreateSpec description to include <I> and <I>
|
diff --git a/superset/utils/core.py b/superset/utils/core.py
index <HASH>..<HASH> 100644
--- a/superset/utils/core.py
+++ b/superset/utils/core.py
@@ -340,6 +340,8 @@ def base_json_conv(obj):
return str(obj)
elif isinstance(obj, timedelta):
return str(obj)
+ elif isinstance(obj, memoryview):
+ return str(obj.tobytes(), 'utf8')
elif isinstance(obj, bytes):
try:
return '{}'.format(obj)
|
Add handling for memoryview (#<I>)
|
diff --git a/bcloud/MimeProvider.py b/bcloud/MimeProvider.py
index <HASH>..<HASH> 100644
--- a/bcloud/MimeProvider.py
+++ b/bcloud/MimeProvider.py
@@ -60,7 +60,9 @@ class MimeProvider:
return (pixbuf, file_type)
else:
key = (UNKNOWN, icon_size)
- pixbuf = self._data.get(key)
+ pixbuf = self._data.get(key, None)
+ if not pixbuf:
+ pixbuf = self.get('/placeholder', isdir, icon_size)[0]
return (pixbuf, file_type)
def get_icon_name(self, path, isdir):
|
Fixed: loading UNKNOWN icon
|
diff --git a/app/ui/components/RunLog.js b/app/ui/components/RunLog.js
index <HASH>..<HASH> 100644
--- a/app/ui/components/RunLog.js
+++ b/app/ui/components/RunLog.js
@@ -9,8 +9,7 @@ export default class RunLog extends Component {
}
render () {
- const { style, commands } = this.props
-
+ const {style, commands} = this.props
const makeCommandToTemplateMapper = (depth) => (command) => {
const {id, isCurrent, description, children, handledAt} = command
const style = [styles[`indent-${depth}`]]
|
rebase app-3-0-nested-commands-rebase, remove mock nested command data, use generated robot commands
|
diff --git a/src/Composer/Package/Version/VersionParser.php b/src/Composer/Package/Version/VersionParser.php
index <HASH>..<HASH> 100644
--- a/src/Composer/Package/Version/VersionParser.php
+++ b/src/Composer/Package/Version/VersionParser.php
@@ -178,7 +178,7 @@ class VersionParser
*/
public function parseNumericAliasPrefix($branch)
{
- if (preg_match('/^(?<version>(\d+\\.)*\d+)(?:\.x)?-dev$/i', $branch, $matches)) {
+ if (preg_match('/^(?P<version>(\d+\\.)*\d+)(?:\.x)?-dev$/i', $branch, $matches)) {
return $matches['version'].".";
}
|
Add the P character to the regex pattern
According to <URL>: Compilation failed: unrecognized character after (?< at offset 4
Exception trace:
() at phar:///var/www/git/smmqa/app/admin/composer.phar/src/Composer/Package/Version/VersionParser.php:<I>
|
diff --git a/lib/quadrigacx/client/private.rb b/lib/quadrigacx/client/private.rb
index <HASH>..<HASH> 100644
--- a/lib/quadrigacx/client/private.rb
+++ b/lib/quadrigacx/client/private.rb
@@ -60,7 +60,7 @@ module QuadrigaCX
#
# coin – The coin type
# amount – The amount to withdraw.
- # address – The litecoin address we will send the amount to.
+ # address – The coin type's address we will send the amount to.
def withdraw coin, params={}
raise ConfigurationError.new('No coin type specified') unless coin
raise ConfigurationError.new('Invalid coin type specified') unless Coin.valid?(coin)
|
Remove reference of litecoin for deposit_address
|
diff --git a/lib/statsd.js b/lib/statsd.js
index <HASH>..<HASH> 100644
--- a/lib/statsd.js
+++ b/lib/statsd.js
@@ -358,7 +358,7 @@ Client.prototype.sendMessage = function (message, callback) {
return;
}
- if (!this.socket) {
+ if (!this.socket && callback) {
return callback(new Error('Socket not created properly. Check previous errors for details.'));
}
|
Check callback is set when socket not set
|
diff --git a/src/raven.js b/src/raven.js
index <HASH>..<HASH> 100644
--- a/src/raven.js
+++ b/src/raven.js
@@ -338,7 +338,11 @@ function parseDSN(str) {
dsn = {},
i = 7;
- while (i--) dsn[dsnKeys[i]] = m[i] || '';
+ try {
+ while (i--) dsn[dsnKeys[i]] = m[i] || '';
+ } catch(e) {
+ throw new RavenConfigError('Invalid DSN');
+ }
if (dsn.pass)
throw new RavenConfigError('Do not specify your private key in the DSN.');
diff --git a/test/raven.test.js b/test/raven.test.js
index <HASH>..<HASH> 100644
--- a/test/raven.test.js
+++ b/test/raven.test.js
@@ -174,6 +174,16 @@ describe('globals', function() {
// shouldn't hit this
assert.isTrue(false);
});
+
+ it('should raise a RavenConfigError with an invalid DSN', function() {
+ try {
+ parseDSN('lol');
+ } catch(e) {
+ return assert.equal(e.name, 'RavenConfigError');
+ }
+ // shouldn't hit this
+ assert.isTrue(false);
+ });
});
describe('normalizeFrame', function() {
|
Raise a RavenConfigError with an invalid DSN in general
|
diff --git a/pyrogram/client/storage/file_storage.py b/pyrogram/client/storage/file_storage.py
index <HASH>..<HASH> 100644
--- a/pyrogram/client/storage/file_storage.py
+++ b/pyrogram/client/storage/file_storage.py
@@ -67,6 +67,17 @@ class FileStorage(SQLiteStorage):
# noinspection PyTypeChecker
self.update_peers(peers.values())
+ def update(self):
+ version = self.version()
+
+ if version == 1:
+ with self.lock, self.conn:
+ self.conn.execute("DELETE FROM peers")
+
+ version += 1
+
+ self.version(version)
+
def open(self):
path = self.database
file_exists = path.is_file()
@@ -97,6 +108,8 @@ class FileStorage(SQLiteStorage):
if not file_exists:
self.create()
+ else:
+ self.update()
with self.conn:
try: # Python 3.6.0 (exactly this version) is bugged and won't successfully execute the vacuum
|
Implement a storage update mechanism (for FileStorage)
The idea is pretty simple: get the current database version and for each
older version, do what needs to be done in order to get to the next
version state. This will make schema changes transparent to the user in
case they are needed.
|
diff --git a/lib/Zoop/Shard/User/DataModel/PasswordTrait.php b/lib/Zoop/Shard/User/DataModel/PasswordTrait.php
index <HASH>..<HASH> 100644
--- a/lib/Zoop/Shard/User/DataModel/PasswordTrait.php
+++ b/lib/Zoop/Shard/User/DataModel/PasswordTrait.php
@@ -33,7 +33,6 @@ trait PasswordTrait
/**
* @ODM\String
* @Shard\Serializer\Ignore
- * @Shard\Validator\Required
*/
protected $salt;
|
Remove required from passwordTrait salt. It has a salt generator fallback.
|
diff --git a/src/Negotiation/FormatNegotiator.php b/src/Negotiation/FormatNegotiator.php
index <HASH>..<HASH> 100644
--- a/src/Negotiation/FormatNegotiator.php
+++ b/src/Negotiation/FormatNegotiator.php
@@ -68,7 +68,7 @@ class FormatNegotiator extends Negotiator implements FormatNegotiatorInterface
}
}
- // If $priorities is empty or contains a catch-all mime type
+ // if `$priorities` is empty or contains a catch-all mime type
if ($catchAllEnabled) {
return array_shift($acceptHeaders) ?: null;
}
diff --git a/tests/Negotiation/Tests/FormatNegotiatorTest.php b/tests/Negotiation/Tests/FormatNegotiatorTest.php
index <HASH>..<HASH> 100644
--- a/tests/Negotiation/Tests/FormatNegotiatorTest.php
+++ b/tests/Negotiation/Tests/FormatNegotiatorTest.php
@@ -277,6 +277,16 @@ class FormatNegotiatorTest extends TestCase
array(),
'text/html',
),
+ // IE8 Accept header
+ array(
+ 'image/jpeg, application/x-ms-application, image/gif, application/xaml+xml, image/pjpeg, application/x-ms-xbap, */*',
+ array(
+ 'text/html',
+ 'application/xhtml+xml',
+ '*/*'
+ ),
+ 'text/html',
+ ),
);
}
|
Add a failing test with IE8 Accept
|
diff --git a/consumer_group.go b/consumer_group.go
index <HASH>..<HASH> 100644
--- a/consumer_group.go
+++ b/consumer_group.go
@@ -175,6 +175,7 @@ func (c *consumerGroup) Consume(ctx context.Context, topics []string, handler Co
// loop check topic partition numbers changed
// will trigger rebalance when any topic partitions number had changed
+ // avoid Consume function called again that will generate more than loopCheckPartitionNumbers coroutine
go c.loopCheckPartitionNumbers(topics, sess)
// Wait for session exit signal
@@ -462,6 +463,10 @@ func (c *consumerGroup) loopCheckPartitionNumbers(topics []string, session *cons
}
select {
case <-pause.C:
+ case <-session.ctx.Done():
+ Logger.Printf("loop check partition number coroutine will exit, topics %s", topics)
+ // if session closed by other, should be exited
+ return
case <-c.closed:
return
}
|
solve call Consumer function agin, will generate more than loopCheckPartitionsNumber Coroutine
|
diff --git a/Processor.php b/Processor.php
index <HASH>..<HASH> 100644
--- a/Processor.php
+++ b/Processor.php
@@ -1170,7 +1170,8 @@ class Processor
// Last resort, use @vocab if set and the result isn't an empty string
if (isset($activectx['@vocab']) && (0 === strpos($iri, $activectx['@vocab'])) &&
- (false !== ($relativeIri = substr($iri, strlen($activectx['@vocab']))))) {
+ (false !== ($relativeIri = substr($iri, strlen($activectx['@vocab'])))) &&
+ (false === isset($activectx[$relativeIri]))) {
if (null === $result) {
return $relativeIri;
}
|
Ensure that @vocab compaction isn't used if the result collides with a term
|
diff --git a/sos/report/plugins/memory.py b/sos/report/plugins/memory.py
index <HASH>..<HASH> 100644
--- a/sos/report/plugins/memory.py
+++ b/sos/report/plugins/memory.py
@@ -27,7 +27,8 @@ class Memory(Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin, CosPlugin):
"/proc/pagetypeinfo",
"/proc/vmallocinfo",
"/sys/kernel/mm/ksm",
- "/sys/kernel/mm/transparent_hugepage/enabled"
+ "/sys/kernel/mm/transparent_hugepage/enabled",
+ "/sys/kernel/mm/hugepages"
])
self.add_cmd_output("free", root_symlink="free")
self.add_cmd_output([
|
[memory]:Add support to collect memory logs
This patch updates memory plugin to collect
hugepage memory information
Resolves: #<I>
|
diff --git a/src/transforms/ViewLayout.js b/src/transforms/ViewLayout.js
index <HASH>..<HASH> 100644
--- a/src/transforms/ViewLayout.js
+++ b/src/transforms/ViewLayout.js
@@ -81,9 +81,9 @@ function layoutGroup(view, group, _) {
function axisIndices(datum) {
var index = +datum.grid;
return [
- datum.tick ? index++ : -1, // tick index
- datum.label ? index++ : -1, // label index
- index + (+datum.domain) // title index
+ datum.ticks ? index++ : -1, // ticks index
+ datum.labels ? index++ : -1, // labels index
+ index + (+datum.domain) // title index
];
}
|
Update to use standardized axis ticks/labels names.
|
diff --git a/mithril.js b/mithril.js
index <HASH>..<HASH> 100644
--- a/mithril.js
+++ b/mithril.js
@@ -636,7 +636,12 @@ var m = (function app(window, undefined) {
}
else nextSibling.insertAdjacentHTML("beforebegin", data);
}
- else parentElement.insertAdjacentHTML("beforeend", data);
+ else {
+ if (window.Range && window.Range.prototype.createContextualFragment) {
+ parentElement.appendChild($document.createRange().createContextualFragment(data));
+ }
+ else parentElement.insertAdjacentHTML("beforeend", data);
+ }
var nodes = [];
while (parentElement.childNodes[index] !== nextSibling) {
nodes.push(parentElement.childNodes[index]);
|
Fixes #<I>. Firefox insertAdjacentHTML updating text nodes with "beforeend" instead of creating new ones.
|
diff --git a/sprd/manager/TextConfigurationManager.js b/sprd/manager/TextConfigurationManager.js
index <HASH>..<HASH> 100644
--- a/sprd/manager/TextConfigurationManager.js
+++ b/sprd/manager/TextConfigurationManager.js
@@ -178,9 +178,6 @@ define(["sprd/manager/ITextConfigurationManager", "flow", 'sprd/entity/Size', "t
paragraph.addChild(span);
}
-
- }
-
configurationObject.textFlow = textFlow;
configurationObject.selection = TextRange.createTextRange(0, 0);
configurationObject.textArea = new Size({
|
Remove extra parenthesis committed in the hurry
|
diff --git a/core-bundle/src/Resources/contao/config/config.php b/core-bundle/src/Resources/contao/config/config.php
index <HASH>..<HASH> 100644
--- a/core-bundle/src/Resources/contao/config/config.php
+++ b/core-bundle/src/Resources/contao/config/config.php
@@ -456,7 +456,7 @@ $GLOBALS['TL_ASSETS'] = array
'COLORBOX' => '1.5.8',
'MEDIAELEMENT' => '2.14.2',
'TABLESORTER' => '2.0.5',
- 'MOOTOOLS' => '1.4.5',
+ 'MOOTOOLS' => '1.5.0',
'COLORPICKER' => '1.4',
'DATEPICKER' => '2.2.0',
'MEDIABOX' => '1.4.6',
|
[Core] Update MooTools to version <I> (see #<I>)
|
diff --git a/class.phpmailer.php b/class.phpmailer.php
index <HASH>..<HASH> 100644
--- a/class.phpmailer.php
+++ b/class.phpmailer.php
@@ -1373,8 +1373,8 @@ class PHPMailer {
$signed = tempnam("", "signed");
if (@openssl_pkcs7_sign($file, $signed, "file://".$this->sign_cert_file, array("file://".$this->sign_key_file, $this->sign_key_pass), NULL)) {
@unlink($file);
- @unlink($signed);
$body = file_get_contents($signed);
+ @unlink($signed);
} else {
@unlink($file);
@unlink($signed);
|
Don;t delete until we use it.
Issue: #6
|
diff --git a/lib/codemirror.js b/lib/codemirror.js
index <HASH>..<HASH> 100644
--- a/lib/codemirror.js
+++ b/lib/codemirror.js
@@ -823,7 +823,7 @@ var CodeMirror = (function() {
}
function updateVerticalScroll(scrollTop) {
- var th = textHeight(), virtualHeight = doc.height * th + 2 * paddingTop(), scrollbarHeight = scroller.clientHeight;
+ var th = textHeight(), virtualHeight = Math.floor(doc.height * th + 2 * paddingTop()), scrollbarHeight = scroller.clientHeight;
scrollbar.style.height = scrollbarHeight + "px";
if (scroller.clientHeight)
scrollbarInner.style.height = virtualHeight + "px";
@@ -1093,7 +1093,7 @@ var CodeMirror = (function() {
// after the scrollbar appears (during updateVerticalScroll()). Only do this if the scrollbar is
// appearing (if it's disappearing, we don't have to worry about the scroll position, and there are
// issues on IE7 if we turn it off too early).
- var virtualHeight = doc.height * th + 2 * paddingTop(), scrollbarHeight = scroller.clientHeight;
+ var virtualHeight = Math.floor(doc.height * th + 2 * paddingTop()), scrollbarHeight = scroller.clientHeight;
if (virtualHeight > scrollbarHeight) scrollbar.style.display = "block";
checkHeights();
} else {
|
Round off fractional pixel in virtual scroll height calculation
|
diff --git a/src/ofxstatement/tests/test_danske.py b/src/ofxstatement/tests/test_danske.py
index <HASH>..<HASH> 100644
--- a/src/ofxstatement/tests/test_danske.py
+++ b/src/ofxstatement/tests/test_danske.py
@@ -36,8 +36,9 @@ def doctest_DanskeCsvStatementParser():
'Paslaugų ir komisinių pajamos už gaunamus tarptautinius pervedimus USD'
>>> l.date
datetime.datetime(2012, 3, 1, 0, 0)
- >>> l.id
- '5865011796238881019'
+ >>> hash_expected = str(abs(hash((l.date,l.memo,l.amount))))
+ >>> l.id == hash_expected
+ True
Second line is incoming money
>>> l = statement.lines[1]
|
Don’t compare result of hash() against absolute value.
hash() is not guaranteed to give constant results, and actually it has
been changing between different versions of Python. Therefore, id
attribute (which is generated via hash()) shouldn’t be compared to the
absolute value, but to the value generated by the expected algorithm.
|
diff --git a/test/unit/gulp.spec.js b/test/unit/gulp.spec.js
index <HASH>..<HASH> 100644
--- a/test/unit/gulp.spec.js
+++ b/test/unit/gulp.spec.js
@@ -9,7 +9,7 @@ var
_ = require('lodash')
;
-describe.only('gulp', function() {
+describe('gulp', function() {
var folder = process.cwd() + '/test-project/';
var program = {
|
chore: Removed *only* for one test suite
|
diff --git a/salt/states/git.py b/salt/states/git.py
index <HASH>..<HASH> 100644
--- a/salt/states/git.py
+++ b/salt/states/git.py
@@ -77,7 +77,7 @@ def latest(name,
__salt__['git.checkout'](target, rev, user=runas)
if submodules:
- __salt__['git.submodule'](target, user=runas)
+ __salt__['git.submodule'](target, user=runas, opts='--recursive')
new_rev = __salt__['git.revision'](cwd=target, user=runas)
if current_rev != new_rev:
|
Run git submodule with `--recursive`,.
To make sure nested submodules are synced too.
|
diff --git a/kie-internal/src/main/java/org/kie/internal/task/api/model/TaskEvent.java b/kie-internal/src/main/java/org/kie/internal/task/api/model/TaskEvent.java
index <HASH>..<HASH> 100644
--- a/kie-internal/src/main/java/org/kie/internal/task/api/model/TaskEvent.java
+++ b/kie-internal/src/main/java/org/kie/internal/task/api/model/TaskEvent.java
@@ -16,15 +16,14 @@
package org.kie.internal.task.api.model;
import java.io.Externalizable;
-
-import org.kie.api.task.model.User;
-
+import java.util.Date;
public interface TaskEvent extends Externalizable {
public enum TaskEventType{STARTED, ACTIVATED, COMPLETED,
STOPPED, EXITED, FAILED, ADDED,
- CLAIMED, SKIPPED, SUSPENDED, CREATED, FORWARDED, RELEASED};
+ CLAIMED, SKIPPED, SUSPENDED, CREATED,
+ FORWARDED, RELEASED, RESUMED, DELEGATED};
long getId();
@@ -38,8 +37,12 @@ public interface TaskEvent extends Externalizable {
void setType(TaskEventType type);
- User getUser();
+ String getUserId();
- void setUser(User user);
+ void setUserId(String userId);
+
+ Date getLogTime();
+
+ void setLogTime(Date timestamp);
}
|
- updating task event interface for keeping track of the task activity
|
diff --git a/src/Psalm/Internal/Provider/FunctionReturnTypeProvider.php b/src/Psalm/Internal/Provider/FunctionReturnTypeProvider.php
index <HASH>..<HASH> 100644
--- a/src/Psalm/Internal/Provider/FunctionReturnTypeProvider.php
+++ b/src/Psalm/Internal/Provider/FunctionReturnTypeProvider.php
@@ -48,6 +48,7 @@ class FunctionReturnTypeProvider
/**
* @param class-string<FunctionReturnTypeProviderInterface> $class
+ * @psalm-suppress PossiblyUnusedParam
* @return void
*/
public function register(string $class)
|
Suppress PossiblyUnusedParam for PHP <I>
|
diff --git a/spec/opal/stdlib/native/hash_spec.rb b/spec/opal/stdlib/native/hash_spec.rb
index <HASH>..<HASH> 100644
--- a/spec/opal/stdlib/native/hash_spec.rb
+++ b/spec/opal/stdlib/native/hash_spec.rb
@@ -40,5 +40,12 @@ describe Hash do
native = obj.to_n
`#{native}.a_key.key`.should == 1
end
+
+ it 'passes Ruby objects that cannot be converted' do
+ object = Object.new
+ hash = { foo: object }
+ native = hash.to_n
+ expect(`#{native}.foo`).to eq object
+ end
end
end
diff --git a/stdlib/native.rb b/stdlib/native.rb
index <HASH>..<HASH> 100644
--- a/stdlib/native.rb
+++ b/stdlib/native.rb
@@ -33,7 +33,7 @@ module Native
return #{value.to_n};
}
else {
- return nil;
+ return value;
}
}
end
|
Return original value if it cannot be nativized
Native.try_convert makes a best effort to return a native JS object, but
the Ruby object itself can be the native JS object you want and nil
almost never is.
|
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
index <HASH>..<HASH> 100644
--- a/spec/spec_helper.rb
+++ b/spec/spec_helper.rb
@@ -5,7 +5,7 @@ SimpleCov.start
$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
$LOAD_PATH.unshift(File.dirname(__FILE__))
require 'rspec'
-require 'upnp/ssdp'
+require 'upnp'
# Requires supporting files with custom matchers and macros, etc,
# in ./support/ and its subdirectories.
|
Fixed require of old upnp/ssdp
|
diff --git a/lib/middleman-search/extension.rb b/lib/middleman-search/extension.rb
index <HASH>..<HASH> 100644
--- a/lib/middleman-search/extension.rb
+++ b/lib/middleman-search/extension.rb
@@ -26,7 +26,7 @@ module Middleman
end
def search_index_path
- app.config[:http_prefix] + sitemap.find_resource_by_path(extensions[:search].options[:index_path]).destination_path
+ (config || app.config)[:http_prefix] + sitemap.find_resource_by_path(extensions[:search].options[:index_path]).destination_path
end
end
end
|
Fix: search_index_path works in MM3
`app` is not defined for helpers in MM3 - but `config` is
|
diff --git a/server/src/main/java/org/jboss/as/server/deployment/Phase.java b/server/src/main/java/org/jboss/as/server/deployment/Phase.java
index <HASH>..<HASH> 100644
--- a/server/src/main/java/org/jboss/as/server/deployment/Phase.java
+++ b/server/src/main/java/org/jboss/as/server/deployment/Phase.java
@@ -413,6 +413,7 @@ public enum Phase {
public static final int INSTALL_DEPLOYMENT_REPOSITORY = 0x1E00;
public static final int INSTALL_EJB_MANAGEMENT_RESOURCES = 0x1F00;
public static final int INSTALL_APPLICATION_CLIENT = 0x2000;
+ public static final int INSTALL_DSXML_DEPLOYMENT = 0x2010;
// CLEANUP
public static final int CLEANUP_REFLECTION_INDEX = 0x0100;
|
Add begning of deployment model and split processor into parse and install
was: <I>e3b<I>cfbca<I>bafd<I>c8b1f9a2e0
|
diff --git a/acceptance/tests/concurrency/ticket_2659_concurrent_catalog_requests.rb b/acceptance/tests/concurrency/ticket_2659_concurrent_catalog_requests.rb
index <HASH>..<HASH> 100644
--- a/acceptance/tests/concurrency/ticket_2659_concurrent_catalog_requests.rb
+++ b/acceptance/tests/concurrency/ticket_2659_concurrent_catalog_requests.rb
@@ -4,6 +4,7 @@ test_name "concurrent catalog requests (PUP-2659)"
confine :except, :platform => 'windows'
confine :except, :platform => /osx/ # see PUP-4820
confine :except, :platform => 'solaris'
+confine :except, :platform => 'aix'
step "setup a manifest"
|
(PUP-<I>) Skip concurrent requests test on AIX
This commit skips AIX agents when conducting the
`concurrency/ticket_<I>_concurrent_catalog_requests` acceptance
test.
|
diff --git a/src/services/Terminal.js b/src/services/Terminal.js
index <HASH>..<HASH> 100644
--- a/src/services/Terminal.js
+++ b/src/services/Terminal.js
@@ -1,4 +1,4 @@
-const {yellow, blue} = require('chalk');
+const {yellow, red, blue} = require('chalk');
const readline = require('../lib/readline/readline');
const EventEmitter = require('events');
const {Readable} = require('stream');
@@ -111,7 +111,7 @@ module.exports = class Terminal extends EventEmitter {
error(text) {
this._hidePrompt();
- this._console.error(text);
+ this._console.error(red(text));
this._restorePrompt();
}
|
Print app console.error output in red
Consistent with yellow console.warn output. To be supplemented with
icons in the future.
Change-Id: I<I>bc9f<I>ffaab1a<I>ea1f<I>c3c<I>f8fe<I>
|
diff --git a/nolds/measures.py b/nolds/measures.py
index <HASH>..<HASH> 100644
--- a/nolds/measures.py
+++ b/nolds/measures.py
@@ -280,13 +280,18 @@ def lyap_r(data, emb_dim=10, lag=None, min_tsep=None, tau=1, min_vectors=20,
acorr = np.roll(acorr, n - 1)
eps = acorr[n - 1] * (1 - 1.0 / np.e)
lag = 1
+ # small helper function to calculate resulting number of vectors for a
+ # given lag value
+ def nb_vectors(lag_value):
+ return max(0, n - (emb_dim - 1) * lag_value)
+ # find lag
for i in range(1,n):
if acorr[n - 1 + i] < eps \
or acorr[n - 1 - i] < eps \
- or 1.0 * n / emb_dim * i < min_vectors:
+ or nb_vectors(i) < min_vectors:
lag = i
break
- if 1.0 * n / emb_dim * lag < min_vectors:
+ if nb_vectors(lag) < min_vectors:
# FIXME shouldn't we reset lag here?
msg = "autocorrelation declined too slowly to find suitable lag"
warnings.warn(msg, RuntimeWarning)
|
fixes calculation of number of vectors in lyap_r
|
diff --git a/index.js b/index.js
index <HASH>..<HASH> 100644
--- a/index.js
+++ b/index.js
@@ -38,7 +38,7 @@ function gulpInjectFile(opts) {
})
.join('\n');
- content = content.replace(match, injectContent);
+ content = content.replace(match, function() { return injectContent; });
}
file.contents = new Buffer(content);
|
ignore special symbols when doing file content replace
|
diff --git a/src/aperture.js b/src/aperture.js
index <HASH>..<HASH> 100644
--- a/src/aperture.js
+++ b/src/aperture.js
@@ -5,7 +5,7 @@ var _xaperture = require('./internal/_xaperture');
/**
- * Returns a new list, composed of n-tuples of consecutive elements If `n` is
+ * Returns a new list, composed of n-tuples of consecutive elements. If `n` is
* greater than the length of the list, an empty list is returned.
*
* Acts as a transducer if a transformer is given in list position.
|
aperture.js comment lost a comma
|
diff --git a/ara/cli/host.py b/ara/cli/host.py
index <HASH>..<HASH> 100644
--- a/ara/cli/host.py
+++ b/ara/cli/host.py
@@ -40,7 +40,7 @@ class HostList(Lister):
metavar="<order>",
default="-updated",
help=(
- "Orders results by a field ('id', 'created', 'updated', 'name')\n"
+ "Orders hosts by a field ('id', 'created', 'updated', 'name')\n"
"Defaults to '-updated' descending so the most recent host is at the top.\n"
"The order can be reversed by omitting the '-': ara host list --order=updated"
),
diff --git a/ara/cli/playbook.py b/ara/cli/playbook.py
index <HASH>..<HASH> 100644
--- a/ara/cli/playbook.py
+++ b/ara/cli/playbook.py
@@ -51,7 +51,7 @@ class PlaybookList(Lister):
metavar="<order>",
default="-started",
help=(
- "Orders results by a field ('id', 'created', 'updated', 'started', 'ended', 'duration')\n"
+ "Orders playbooks by a field ('id', 'created', 'updated', 'started', 'ended', 'duration')\n"
"Defaults to '-started' descending so the most recent playbook is at the top.\n"
"The order can be reversed by omitting the '-': ara playbook list --order=started"
),
|
CLI: Disambiguate which kind of resource is ordered with --order
"results" might come off as task results instead of "results" from the
query.
Change-Id: I<I>d4f3ec<I>cdd8f<I>edc<I>d<I>
|
diff --git a/test/unit/test_timeout.py b/test/unit/test_timeout.py
index <HASH>..<HASH> 100644
--- a/test/unit/test_timeout.py
+++ b/test/unit/test_timeout.py
@@ -26,7 +26,7 @@ class TestTimeout:
while to.check():
sleep(0.01)
cnt += 1
- if cnt == 4:
+ if cnt == 2:
break
else:
assert False
|
Unit test: shorten TestTimeout.no_timeout so it doesn't fail on certain systems.
|
diff --git a/java/datastore/src/main/java/com/google/api/services/datastore/client/LocalDevelopmentDatastore.java b/java/datastore/src/main/java/com/google/api/services/datastore/client/LocalDevelopmentDatastore.java
index <HASH>..<HASH> 100644
--- a/java/datastore/src/main/java/com/google/api/services/datastore/client/LocalDevelopmentDatastore.java
+++ b/java/datastore/src/main/java/com/google/api/services/datastore/client/LocalDevelopmentDatastore.java
@@ -56,12 +56,12 @@ import java.util.concurrent.TimeUnit;
*
* {@literal @}Before
* public void setUp() throws LocalDevelopmentDatastoreException {
- * datastore.clearDatastore();
+ * datastore.clear();
* }
*
* {@literal @}AfterClass
* public static void stopLocalDatastore() throws LocalDevelopmentDatastoreException {
- * datastore.stopDatastore();
+ * datastore.stop();
* }
*
* {@literal @}Test
|
changed class usage in comment to match code
In the class comment, the example code was invoking the wrong methods:
datastore.stopDatastore() is named datastore.stop()
datastore.clearDatastore() is named datastore.clear()
|
diff --git a/src/org/opencms/i18n/CmsLocaleManager.java b/src/org/opencms/i18n/CmsLocaleManager.java
index <HASH>..<HASH> 100644
--- a/src/org/opencms/i18n/CmsLocaleManager.java
+++ b/src/org/opencms/i18n/CmsLocaleManager.java
@@ -947,6 +947,9 @@ public class CmsLocaleManager implements I_CmsEventListener {
// set default locale
m_defaultLocale = m_defaultLocales.get(0);
try {
+ // use a seed for initializing the language detection for making sure the
+ // same probabilities are detected for the same document contents
+ DetectorFactory.setSeed(42L);
DetectorFactory.loadProfile(loadProfiles(getAvailableLocales()));
} catch (Exception e) {
LOG.error(Messages.get().getBundle().key(Messages.INIT_I18N_LANG_DETECT_FAILED_0), e);
|
Use a seed for initializing the language detection.
|
diff --git a/support/cas-server-support-hazelcast-ticket-registry/src/main/java/org/apereo/cas/ticket/registry/HazelcastTicketRegistry.java b/support/cas-server-support-hazelcast-ticket-registry/src/main/java/org/apereo/cas/ticket/registry/HazelcastTicketRegistry.java
index <HASH>..<HASH> 100644
--- a/support/cas-server-support-hazelcast-ticket-registry/src/main/java/org/apereo/cas/ticket/registry/HazelcastTicketRegistry.java
+++ b/support/cas-server-support-hazelcast-ticket-registry/src/main/java/org/apereo/cas/ticket/registry/HazelcastTicketRegistry.java
@@ -155,7 +155,7 @@ public class HazelcastTicketRegistry extends AbstractTicketRegistry implements C
private IMap<String, Ticket> getTicketMapInstance(final String mapName) {
try {
final IMap<String, Ticket> inst = hazelcastInstance.getMap(mapName);
- LOGGER.debug("Located Hazelcast map instance [{}] for [{}]", inst, mapName);
+ LOGGER.debug("Located Hazelcast map instance [{}]", mapName);
return inst;
} catch (final Exception e) {
LOGGER.error(e.getMessage(), e);
|
Slf4j prints entire Map contents (#<I>)
Found this in <I>.x load testing.
The Sf4j Logger will iterate collections calling toSting() on each entry in a map. This causes severe degradation once the map reaches even a trivial size.
Changed the debug statement to just echo the mapName and not pass instance to the LOGGER.debug().
|
diff --git a/main_test.go b/main_test.go
index <HASH>..<HASH> 100644
--- a/main_test.go
+++ b/main_test.go
@@ -30,7 +30,7 @@ var _ = Describe("main", func() {
})
Context("when extra arguments are provided", func() {
It("prints help and exits", func() {
- cmd := exec.Command(commandPath, "find", "this")
+ cmd := exec.Command(commandPath, "version", "this")
session, err := Start(cmd, GinkgoWriter, GinkgoWriter)
Expect(err).NotTo(HaveOccurred())
<-session.Exited
|
Fix extra args test to hit endpoint that doesn't require authentication
[#<I>]
|
diff --git a/requirements/index.php b/requirements/index.php
index <HASH>..<HASH> 100644
--- a/requirements/index.php
+++ b/requirements/index.php
@@ -102,6 +102,12 @@ $requirements=array(
t('yii','All <a href="http://www.yiiframework.com/doc/api/#system.db">DB-related classes</a>'),
t('yii','Required for MSSQL database with the driver provided by Microsoft.')),
array(
+ t('yii','PDO ODBC extension'),
+ false,
+ extension_loaded('pdo_odbc'),
+ t('yii','All <a href="http://www.yiiframework.com/doc/api/#system.db">DB-related classes</a>'),
+ t('yii','Required in case database interaction will be through ODBC layer.')),
+ array(
t('yii','Memcache extension'),
false,
extension_loaded("memcache") || extension_loaded("memcached"),
|
Add ODBC to the requirements checker
|
diff --git a/annotations/builder/src/main/java/io/sundr/builder/internal/functions/ToMethod.java b/annotations/builder/src/main/java/io/sundr/builder/internal/functions/ToMethod.java
index <HASH>..<HASH> 100644
--- a/annotations/builder/src/main/java/io/sundr/builder/internal/functions/ToMethod.java
+++ b/annotations/builder/src/main/java/io/sundr/builder/internal/functions/ToMethod.java
@@ -578,7 +578,6 @@ public class ToMethod {
String prefix = isCollection ? "addNew" : "withNew";
String suffix = "Like";
- prefix += BuilderUtils.fullyQualifiedNameDiff(property);
String methodName = prefix + captializeFirst(isCollection
? Singularize.FUNCTION.apply(property.getName())
: property.getName()) + suffix;
|
nested-like methods do not need a special prefix.
|
diff --git a/src/main/java/com/dlsc/preferencesfx/formsfx/view/controls/SimpleControl.java b/src/main/java/com/dlsc/preferencesfx/formsfx/view/controls/SimpleControl.java
index <HASH>..<HASH> 100644
--- a/src/main/java/com/dlsc/preferencesfx/formsfx/view/controls/SimpleControl.java
+++ b/src/main/java/com/dlsc/preferencesfx/formsfx/view/controls/SimpleControl.java
@@ -178,8 +178,8 @@ public abstract class SimpleControl<F extends Field, N extends Node> extends com
*/
@Override
protected void updateStyle(PseudoClass pseudo, boolean newValue) {
-// node.pseudoClassStateChanged(pseudo, newValue);
-// fieldLabel.pseudoClassStateChanged(pseudo, newValue);
+// node.pseudoClassStateChanged(pseudo, newValue); // TODO: Fix Exception
+// fieldLabel.pseudoClassStateChanged(pseudo, newValue); // TODO: Fix Exception
}
@Override
|
added todo for exception that has to be fixed
|
diff --git a/oceandb_elasticsearch_driver/plugin.py b/oceandb_elasticsearch_driver/plugin.py
index <HASH>..<HASH> 100644
--- a/oceandb_elasticsearch_driver/plugin.py
+++ b/oceandb_elasticsearch_driver/plugin.py
@@ -182,9 +182,10 @@ class Plugin(AbstractPlugin):
if text:
sort = [{"_score": "desc"}] + sort
- text = text.strip()
- if 'did:op:' in text:
- text = text.replace('did:op:', '0x')
+ if isinstance(text, str):
+ text = [text]
+ text = [t.strip() for t in text]
+ text = [t.replace('did:op:', '0x') for t in text if t]
if search_model.query == {}:
query = {'match_all': {}}
|
fix error, better handling of search text
|
diff --git a/test/unit/middlewares/max-in-flight.spec.js b/test/unit/middlewares/max-in-flight.spec.js
index <HASH>..<HASH> 100644
--- a/test/unit/middlewares/max-in-flight.spec.js
+++ b/test/unit/middlewares/max-in-flight.spec.js
@@ -87,7 +87,7 @@ describe("Test MaxInFlightMiddleware", () => {
FLOW = [];
- return broker.Promise.delay(300).catch(protectReject).then(() => {
+ return broker.Promise.delay(500).catch(protectReject).then(() => {
expect(FLOW).toEqual(expect.arrayContaining([
"handler-4",
"handler-5",
@@ -127,7 +127,7 @@ describe("Test MaxInFlightMiddleware", () => {
FLOW = [];
- return p.delay(300).catch(protectReject).then(() => {
+ return p.delay(500).catch(protectReject).then(() => {
expect(FLOW).toEqual(expect.arrayContaining([
"handler-4",
"QueueIsFullError-9",
@@ -170,7 +170,7 @@ describe("Test MaxInFlightMiddleware", () => {
FLOW = [];
- return p.delay(300).catch(protectReject).then(() => {
+ return p.delay(500).catch(protectReject).then(() => {
expect(FLOW).toEqual(expect.arrayContaining([
"handler-4",
"Error-2",
|
increase delay in MaxInFlight test
|
diff --git a/src/main/java/com/github/ansell/csv/access/AccessMapper.java b/src/main/java/com/github/ansell/csv/access/AccessMapper.java
index <HASH>..<HASH> 100644
--- a/src/main/java/com/github/ansell/csv/access/AccessMapper.java
+++ b/src/main/java/com/github/ansell/csv/access/AccessMapper.java
@@ -252,7 +252,7 @@ public class AccessMapper {
String[] splitDBFieldSource = DOT_PATTERN.split(nextValueMapping.getInputField());
if (nextValueMapping.getLanguage() == ValueMappingLanguage.ACCESS) {
String[] splitDBFieldDest = DOT_PATTERN.split(nextValueMapping.getMapping());
- if (splitDBFieldDest.length != 2) {
+ if (splitDBFieldDest.length < 2) {
throw new RuntimeException(
"Destination mapping was not in the 'table.column' format: " + nextValueMapping);
}
|
Work around issue with multi-mappings, maybe
Might actually be a bug that needs to be fixed with more code
|
diff --git a/anillo/http/responses.py b/anillo/http/responses.py
index <HASH>..<HASH> 100644
--- a/anillo/http/responses.py
+++ b/anillo/http/responses.py
@@ -1,4 +1,5 @@
-from copy import deepcopy
+from anillo.utils.structures import CaseInsensitiveDict
+from anillo.utils.common import merge_dicts
class Response(dict):
@@ -10,7 +11,7 @@ class Response(dict):
super().__init__({
"body": body if body is not None else self.body,
"status": status if status is not None else self.status,
- "headers": headers if headers is not None else deepcopy(self.headers)
+ "headers": CaseInsensitiveDict(merge_dicts(self.headers, headers)),
})
self.update(**kwargs)
self.__dict__ = self
|
Handle in case insensitive way the response headers.
|
diff --git a/src/pyshark/capture/inmem_capture.py b/src/pyshark/capture/inmem_capture.py
index <HASH>..<HASH> 100644
--- a/src/pyshark/capture/inmem_capture.py
+++ b/src/pyshark/capture/inmem_capture.py
@@ -58,7 +58,7 @@ class InMemCapture(Capture):
Returns the special tshark parameters to be used according to the configuration of this class.
"""
params = super(InMemCapture, self).get_parameters(packet_count=packet_count)
- params += ['-r', '-']
+ params += ['-i', '-']
return params
@asyncio.coroutine
|
Reverted InMem to work via interface
|
diff --git a/app/helpers/list_helper.rb b/app/helpers/list_helper.rb
index <HASH>..<HASH> 100644
--- a/app/helpers/list_helper.rb
+++ b/app/helpers/list_helper.rb
@@ -2,7 +2,7 @@ module ListHelper
ICON_DOWN = "icon-arrow-down"
ICON_UP = "icon-arrow-up"
- BOOTSTRAP_BOOLEAN_MAP = {
+ BOOLEAN_BOOTSTRAP_MAP = {
true => { icon: "icon-white icon-ok", badge: "badge badge-success"},
false => { icon: "icon-white icon-remove", badge: "badge badge-important"}
}
@@ -164,8 +164,8 @@ module ListHelper
# Returns String of the appropriate icon.
def display_boolean(boolean)
content_tag(:span,
- content_tag(:i, "", class: BOOTSTRAP_BOOLEAN_MAP[!!boolean][:icon]),
- class: BOOTSTRAP_BOOLEAN_MAP[!!boolean][:badge])
+ content_tag(:i, "", class: BOOLEAN_BOOTSTRAP_MAP[!!boolean][:icon]),
+ class: BOOLEAN_BOOTSTRAP_MAP[!!boolean][:badge])
end
@@ -257,4 +257,10 @@ module ListHelper
def column_attribute_class(attribute)
"column-#{attribute}".parameterize
end
+
+
+ # Public: Call the BOOLEAN_BOOTSTRAP_MAP
+ def boolean_bootstrap_map
+ BOOLEAN_BOOTSTRAP_MAP
+ end
end
|
Add back boolean helper; change constant name
|
diff --git a/staging/src/k8s.io/apiserver/pkg/storage/etcd3/store_test.go b/staging/src/k8s.io/apiserver/pkg/storage/etcd3/store_test.go
index <HASH>..<HASH> 100644
--- a/staging/src/k8s.io/apiserver/pkg/storage/etcd3/store_test.go
+++ b/staging/src/k8s.io/apiserver/pkg/storage/etcd3/store_test.go
@@ -692,6 +692,7 @@ func testPropogateStore(ctx context.Context, t *testing.T, store *store, obj *ex
func TestPrefix(t *testing.T) {
codec := apitesting.TestCodec(codecs, examplev1.SchemeGroupVersion)
cluster := integration.NewClusterV3(t, &integration.ClusterConfig{Size: 1})
+ defer cluster.Terminate(t)
transformer := prefixTransformer{prefix: []byte("test!")}
testcases := map[string]string{
"custom/prefix": "/custom/prefix",
|
delete etcd socket file for unit tests
This change clean up the environment for etcd3 unit test.
Without this change, "make test" will leave some socket files in
workspace. And these socket files make hack/verify-generated-protobuf.sh
fails.
|
diff --git a/resources/views/auth/two-factor-auth.blade.php b/resources/views/auth/two-factor-auth.blade.php
index <HASH>..<HASH> 100644
--- a/resources/views/auth/two-factor-auth.blade.php
+++ b/resources/views/auth/two-factor-auth.blade.php
@@ -18,7 +18,7 @@
<h3>{{ trans('dashboard.login.two-factor') }}</h3>
</div>
<br>
- <form method="POST" action="/auth/2fa" accept-charset="UTF-8">
+ <form method="POST" action="{{ route('auth.two-factor') }}" accept-charset="UTF-8">
<input type="hidden" name="_token" value="{{ csrf_token() }}">
<fieldset>
|
Use the auth.two-factor route
|
Subsets and Splits
No community queries yet
The top public SQL queries from the community will appear here once available.